From e53e7acac358a437baa6d3612be90249d9649499 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 30 2021 04:20:28 +0000 Subject: import oscap-anaconda-addon-1.2.0-2.el8 --- diff --git a/.gitignore b/.gitignore index 8194750..c466b13 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/oscap-anaconda-addon-1.1.1.tar.gz +SOURCES/oscap-anaconda-addon-1.2.0.tar.gz diff --git a/.oscap-anaconda-addon.metadata b/.oscap-anaconda-addon.metadata index 72359c4..81e0c75 100644 --- a/.oscap-anaconda-addon.metadata +++ b/.oscap-anaconda-addon.metadata @@ -1 +1 @@ -789fbf8b6c8618619fb484a635c29d638202d015 SOURCES/oscap-anaconda-addon-1.1.1.tar.gz +3c1e0b7194fae2d1ba496a005f2322dbb25ff5fc SOURCES/oscap-anaconda-addon-1.2.0.tar.gz diff --git a/SOURCES/lang.patch b/SOURCES/lang.patch index 8723077..da291bf 100644 --- a/SOURCES/lang.patch +++ b/SOURCES/lang.patch @@ -1,5777 +1,7960 @@ -Binary files a/po/ca.mo and b/po/ca.mo differ diff -U3 -N -r a/po/ca.po b/po/ca.po ---- a/po/ca.po 2020-06-02 14:20:56.000000000 +0200 -+++ b/po/ca.po 2021-02-15 11:32:20.362504514 +0100 -@@ -4,14 +4,13 @@ - # - # Translators: - # Robert Antoni Buj i Gelonch , 2015 --# Ding-Yi Chen , 2015. #zanata - # Robert Antoni Buj Gelonch , 2015. #zanata - msgid "" +--- a/po/ca.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/ca.po 2021-07-16 11:11:54.663604756 +0200 +@@ -9,10 +9,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2015-09-29 07:30+0000\n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2015-09-29 07:31-0400\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"POT-Creation-Date: 2021-06-21 11:51+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-addon/language/ca/)\n" +-"Language-Team: Catalan (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/ca/)\n" ++"Language-Team: Catalan (http://www.transifex.com/projects/p/oscap-anaconda-" ++"addon/language/ca/)\n" "Language: ca\n" -@@ -21,7 +20,7 @@ + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" +@@ -20,7 +21,31 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, fuzzy, python-brace-format ++#| msgid "The integrity check of the content failed. Cannot use the content." ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "" ++"Ha fallat la comprovació de la integritat del contingut. No es pot utilitzar " ++"el contingut." ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -30,7 +29,7 @@ +@@ -29,7 +54,7 @@ msgstr "" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -39,78 +38,86 @@ +@@ -38,33 +63,33 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, 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:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 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:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, 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:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, 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:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -72,190 +97,203 @@ + "installation." + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, 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:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" msgstr "" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" msgstr "" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" msgstr "" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" msgstr "" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, 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:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, 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:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, 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:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -124,118 +131,131 @@ - "%s\n" - "The installation should be aborted. Do you wish to continue anyway?" + "firewall" msgstr "" -+"Hi va haver un error en la captura i la càrrega del contingut de seguretat:\n" -+"%s\n" -+"S'hauria d'avortar la instal·lació. Voleu continuar de totes maneres?" - #: ../org_fedora_oscap/ks/oscap.py:447 - msgid "" - "The integrity check of the security content failed.\n" - "The installation should be aborted. Do you wish to continue anyway?" +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." msgstr "" -+"Ha fallat la comprovació de la integritat del contingut de seguretat.\n" -+"S'hauria d'avortar la instal·lació. Voleu continuar de totes maneres?" +-"Hi va haver un error en la captura i la càrrega del contingut de seguretat:\n" +-"%s\n" +-"S'hauria d'avortar la instal·lació. Voleu continuar de totes maneres?" - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "PERFIL DE _SEGURETAT" -+msgid "_Security Policy" +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:377 ++msgid "Do you wish to continue anyway?" + msgstr "" +-"Ha fallat la comprovació de la integritat del contingut de seguretat.\n" +-"S'hauria d'avortar la instal·lació. Voleu continuar de totes maneres?" ++ ++#: ../org_fedora_oscap/ks/oscap.py:400 ++#, fuzzy ++#| msgid "The integrity check of the content failed. Cannot use the content." ++msgid "The integrity check of the security content failed." ++msgstr "" ++"Ha fallat la comprovació de la integritat del contingut. No es pot utilitzar " ++"el contingut." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++#, 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 ++msgid "There was an unexpected problem with the supplied content." +msgstr "" ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "S'ha detectat una configuració errònia" + + #. title of the spoke (will be displayed on the hub) +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" msgstr "No està llest" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" msgstr "S'estan obtenint les dades del contingut" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" msgstr "No s'ha seleccionat cap perfil" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 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:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 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." +-"S'ha proporcionat un context no vàlid. Si us plau, introduïu un URL " +-"diferent." ++"S'ha proporcionat un context no vàlid. Si us plau, introduïu un URL diferent." --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 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." +-"L'URL del contingut no és vàlid o no està admès, si us plau, introduïu-ne un" +-" altre diferent." ++"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:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." msgstr "" -+"S'ha detectat un error de xarxa quan es capturaven les dades. Reviseu que la" -+" xarxa estigui configurada i que aquesta estigui funcionant." +-"S'ha detectat un error de xarxa quan es capturaven les dades. Reviseu que la" +-" xarxa estigui configurada i que aquesta estigui funcionant." ++"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:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 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." +-"Ha fallat la comprovació de la integritat del contingut. No es pot utilitzar" +-" el contingut." ++"Ha fallat la comprovació de la integritat del contingut. No es pot utilitzar " ++"el contingut." --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, 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:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" msgstr "" -+"El perfil amb l'id. «%s» no està definit en el contingut. Seleccioneu un " -+"perfil diferent, si us plau" + "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:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" 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:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 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:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" --msgstr "" -+msgstr "S'ha produït un error en capturar i carregar el contingut" + msgstr "S'ha produït un error en capturar i carregar el contingut" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" msgstr "No s'ha trobat cap contingut" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" msgstr "S'ha detectat una configuració errònia" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" msgstr "Advertències que van aparèixer" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" msgstr "Tot està bé" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" msgstr "L'URL no és vàlid o no està admès" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." msgstr "S'està obtenint el contingut..." -@@ -283,11 +303,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_Utilitza la guia de seguretat SCAP" - --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -306,3 +344,20 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" msgstr "_Obté" -Binary files a/po/cs.mo and b/po/cs.mo differ ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Hi va haver un error en la captura i la càrrega del contingut de " ++#~ "seguretat:\n" ++#~ "%s\n" ++#~ "S'hauria d'avortar la instal·lació. Voleu continuar de totes maneres?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Ha fallat la comprovació de la integritat del contingut de seguretat.\n" ++#~ "S'hauria d'avortar la instal·lació. Voleu continuar de totes maneres?" diff -U3 -N -r a/po/cs.po b/po/cs.po ---- a/po/cs.po 2020-06-02 14:21:01.000000000 +0200 -+++ b/po/cs.po 2021-02-15 11:32:20.362504514 +0100 -@@ -5,23 +5,26 @@ - # Translators: - # vpodzime , 2014-2015 - # Zdenek , 2016. #zanata -+# Zdenek , 2017. #zanata - # Daniel Rusek , 2018. #zanata -+# Matěj Týč , 2020. #zanata, 2021. - msgid "" +--- a/po/cs.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/cs.po 2021-07-16 11:11:54.663604756 +0200 +@@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2018-10-23 10:58+0000\n" --"Last-Translator: Daniel Rusek \n" --"Language-Team: Czech (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/cs/)\n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2021-02-10 21:09+0000\n" -+"Last-Translator: Matěj Týč \n" -+"Language-Team: Czech \n" - "Language: cs\n" - "MIME-Version: 1.0\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" +-"PO-Revision-Date: 2021-02-10 21:09+0000\n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" ++"PO-Revision-Date: 2021-07-13 13:04+0000\n" + "Last-Translator: Matěj Týč \n" + "Language-Team: Czech \n" +@@ -22,9 +22,31 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" --"X-Generator: Zanata 4.6.2\n" -+"X-Generator: Weblate 4.4.2\n" +-"X-Generator: Weblate 4.4.2\n" ++"X-Generator: Weblate 4.7.1\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "Nelze rozbalit archiv jako soubor zip: {exc}" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, python-brace-format ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++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 "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 "Nezdařilo se stažení dat - HTTP požadavek skončil chybou {return_code}" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -33,24 +36,24 @@ +@@ -36,24 +58,24 @@ "bezpečnostním profilem" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, 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:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, 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:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 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:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " -@@ -59,58 +62,68 @@ +@@ -62,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:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, 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:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+"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:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -78,113 +100,119 @@ + "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:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, 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:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" msgstr "Kdump bude při spuštění zakázán" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" msgstr "Kdump bude při spuštění povolen" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" msgstr "Firewall bude při spuštění zakázán" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" msgstr "Firewall bude při spuštění povolen" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, 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:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, 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:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, 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:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -138,40 +151,40 @@ + "firewall" + msgstr "služba '%s' byla přidána na seznam služeb k odebrání z firewallu" + +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +-"Při získávání a načítání bezpečnostních dat došlo k chybě:\n" +-"%s\n" +-"Instalace by měla být přerušena. Chcete i přesto pokračovat?" +- +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +-"Test integrity bezpečnostních dat neprošel.\n" +-"Instalace by měla být přerušena. Chcete i přesto pokračovat?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." ++msgstr "Instalaci byste měli ukončit." ++ ++#: ../org_fedora_oscap/ks/oscap.py:377 ++msgid "Do you wish to continue anyway?" ++msgstr "Přejete si přesto pokračovat?" ++ ++#: ../org_fedora_oscap/ks/oscap.py:400 ++msgid "The integrity check of the security content failed." ++msgstr "Test integrity dat neprošel." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++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:\n" ++ ++#: ../org_fedora_oscap/ks/oscap.py:409 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:774 ++msgid "There was an unexpected problem with the supplied content." ++msgstr "Došlo k nečekanému problému s daty." ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++msgid "Wrong configuration detected!" ++msgstr "Detekována nesprávná konfigurace!" #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "_POLITIKA ZABEZPEČENÍ" -+msgid "_Security Policy" -+msgstr "_Politika zabezpečení" +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "_Politika zabezpečení" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" msgstr "Není připraven" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" msgstr "Načítají se data" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" msgstr "Není vybrán žádný profil" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" msgstr "Žádná pravidla pro předinstalační fázi" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." msgstr "Nevalidní data. Zadejte jiné URL, prosím." --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 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:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." -@@ -179,63 +192,63 @@ +@@ -192,63 +220,63 @@ "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:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 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:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, 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:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"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:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" msgstr "Neaplikovat bezpečnostní politiku" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" - msgstr "nebo zadejte URL data streamu, případně archivu:" +-msgstr "nebo zadejte URL data streamu, případně archivu:" ++msgstr " nebo zadejte URL data streamu, případně archivu:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 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:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" msgstr "Žádná data k dispozici" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" msgstr "Detekována nesprávná konfigurace" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" msgstr "Varování" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" msgstr "Vše v pořádku" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" msgstr "Nevalidní nebo nepodporované URL" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." msgstr "Načítám data..." -@@ -283,11 +296,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_Použít SCAP Security Guide" - --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -299,3 +327,19 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" msgstr "_Načíst" -Binary files a/po/de.mo and b/po/de.mo differ ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Při získávání a načítání bezpečnostních dat došlo k chybě:\n" ++#~ "%s\n" ++#~ "Instalace by měla být přerušena. Chcete i přesto pokračovat?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Test integrity bezpečnostních dat neprošel.\n" ++#~ "Instalace by měla být přerušena. Chcete i přesto pokračovat?" diff -U3 -N -r a/po/de.po b/po/de.po ---- a/po/de.po 2020-06-02 14:21:10.000000000 +0200 -+++ b/po/de.po 2021-02-15 11:32:20.362504514 +0100 -@@ -1,11 +1,10 @@ --# Ludek Janda , 2018. #zanata - # Ludek Janda , 2019. #zanata +--- a/po/de.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/de.po 2021-07-16 11:11:54.663604756 +0200 +@@ -1,20 +1,45 @@ +-# Ludek Janda , 2019. #zanata ++# Ludek Janda , 2019. #zanata, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2019-02-12 02:14+0000\n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2019-08-30 10:55-0400\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" +-"PO-Revision-Date: 2019-08-30 10:55-0400\n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" ++"PO-Revision-Date: 2021-07-13 13:04+0000\n" "Last-Translator: Ludek Janda \n" - "Language-Team: German\n" +-"Language-Team: German\n" ++"Language-Team: German \n" "Language: de\n" -@@ -15,7 +14,7 @@ - "Plural-Forms: nplurals=2; plural=(n != 1)\n" - "X-Generator: Zanata 4.6.2\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.7.1\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, fuzzy, python-brace-format ++#| msgid "The integrity check of the content failed. Cannot use the content." ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "" ++"Die Integritätsprüfung des Inhalts ist fehlgeschlagen. Der Inhalt kann nicht " ++"verwendet werden." ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -27,7 +26,7 @@ +@@ -26,7 +51,7 @@ "Installation mit einem Sicherheitsprofil erfolgen kann" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -36,21 +35,21 @@ +@@ -35,21 +60,21 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, 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:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 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:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " -@@ -59,36 +58,44 @@ +@@ -58,13 +83,13 @@ "Das root-Passwort ist zu kurz, ein längeres mit mindestens %d Zeichen sind " "erforderlich" --#: ../org_fedora_oscap/rule_handling.py:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, 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:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -72,30 +97,30 @@ + "installation." + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, 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:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" msgstr "Kdump wird beim Start deaktiviert" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" msgstr "Kdump wird beim Start aktiviert" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" msgstr "Die Firewall wird beim Start deaktiviert" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" msgstr "Die Firewall wird beim Start aktiviert" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, python-format msgid "" "service '%s' has been added to the list of services to be added to the " -@@ -97,8 +104,8 @@ +@@ -104,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:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, python-format msgid "" "port '%s' has been added to the list of ports to be added to the firewall" -@@ -106,8 +113,8 @@ +@@ -113,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:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, python-format msgid "" "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -115,8 +122,8 @@ +@@ -122,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:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -146,43 +153,43 @@ - - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "_SICHERHEITSPOLITIK" -+msgid "_Security Policy" -+msgstr "_Sicherheitspolitik" +@@ -132,64 +157,78 @@ + "Bedienung '%s'wurde der Liste der Dienste hinzugefügt, die aus der Firewall " + "entfernt werden sollen" - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "Nicht bereit" +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." + msgstr "" +-"Beim Abrufen und Laden des Sicherheitsinhalts ist ein Fehler " +-"aufgetreten:%sDie Installation sollte abgebrochen werden. Möchten Sie " +-"trotzdem fortfahren?" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../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." ++msgid "The integrity check of the security content failed." ++msgstr "" ++"Die Integritätsprüfung des Inhalts ist fehlgeschlagen. Der Inhalt kann nicht " ++"verwendet werden." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++#, 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 ++msgid "There was an unexpected problem with the supplied content." + msgstr "" +-"Die Integritätsprüfung des Sicherheitsinhalts ist fehlgeschlagen. Die " +-"Installation sollte abgebrochen werden. Möchten Sie trotzdem fortfahren?" ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "Fehlkonfiguration erkannt" + + #. title of the spoke (will be displayed on the hub) +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" +-msgstr "_Sicherheitspolitik" ++msgstr "_Sicherheitsrichtlinie" + + #. the first status provided +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 + msgid "Not ready" + msgstr "Nicht bereit" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" msgstr "Inhaltsdaten abrufen" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" msgstr "Kein Profil ausgewählt" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" msgstr "Keine Regeln für die Vorinstallationsphase" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 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:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 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:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." -@@ -190,20 +197,20 @@ +@@ -197,76 +236,76 @@ "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:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 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." +-"Die Integritätsprüfung des Inhalts ist fehlgeschlagen. Der Inhalt kann nicht" +-" verwendet werden." ++"Die Integritätsprüfung des Inhalts ist fehlgeschlagen. Der Inhalt kann nicht " ++"verwendet werden." --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, 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:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," -@@ -212,48 +219,48 @@ +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" + msgstr "" "Profil mit ID '%s'im Inhalt nicht definiert. Bitte wählen Sie ein anderes " "Profil" --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" msgstr "Keine Sicherheitsrichtlinie anwenden" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 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:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" msgstr "Fehler beim Abrufen und Laden von Inhalten" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" msgstr "Kein Inhalt gefunden" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" msgstr "Fehlkonfiguration erkannt" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" msgstr "Warnungen erschienen" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" msgstr "Alles okay" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" msgstr "Ungültige oder nicht unterstützte URL" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." msgstr "Inhalt wird abgerufen ..." -@@ -282,10 +289,12 @@ - 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" - -@@ -301,11 +310,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_Verwenden Sie das SCAP-Sicherheitshandbuch" + #: tmp/oscap.glade.h:1 + msgid "SECURITY POLICY" +-msgstr "SICHERHEITSPOLITIK" ++msgstr "SICHERHEITSRICHTLINIE" --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- + #: tmp/oscap.glade.h:2 + msgid "_Change content" +@@ -313,3 +352,19 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" msgstr "_Fetch" -Binary files a/po/es.mo and b/po/es.mo differ ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Beim Abrufen und Laden des Sicherheitsinhalts ist ein Fehler aufgetreten:" ++#~ "%sDie Installation sollte abgebrochen werden. Möchten Sie trotzdem " ++#~ "fortfahren?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Die Integritätsprüfung des Sicherheitsinhalts ist fehlgeschlagen. Die " ++#~ "Installation sollte abgebrochen werden. Möchten Sie trotzdem fortfahren?" diff -U3 -N -r a/po/es.po b/po/es.po ---- a/po/es.po 2020-06-02 14:21:45.000000000 +0200 -+++ b/po/es.po 2021-02-15 11:32:20.362504514 +0100 -@@ -5,14 +5,15 @@ - # Translators: - # Gerardo Rosales , 2014 - # Máximo Castañeda Riloba , 2016. #zanata --# Ludek Janda , 2018. #zanata -+# Máximo Castañeda Riloba , 2017. #zanata -+# Máximo Castañeda Riloba , 2018. #zanata - # Ludek Janda , 2019. #zanata - msgid "" +--- a/po/es.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/es.po 2021-07-16 11:11:54.663604756 +0200 +@@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2019-02-12 02:16+0000\n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2019-08-30 10:53-0400\n" - "Last-Translator: Ludek Janda \n" - "Language-Team: Spanish (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/es/)\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" + "PO-Revision-Date: 2021-02-23 18:40+0000\n" + "Last-Translator: Emilio Herrera \n" +-"Language-Team: Spanish \n" ++"Language-Team: Spanish \n" "Language: es\n" -@@ -22,7 +23,7 @@ - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: Zanata 4.6.2\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" +@@ -25,7 +25,31 @@ + "Plural-Forms: nplurals=2; plural=n != 1;\n" + "X-Generator: Weblate 4.4.2\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, fuzzy, python-brace-format ++#| msgid "The integrity check of the content failed. Cannot use the content." ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "" ++"Falló la comprobación de la integridad del contenido. No se puede usar el " ++"mismo." ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -34,7 +35,7 @@ +@@ -37,7 +61,7 @@ "con un perfil de seguridad" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -43,20 +44,20 @@ +@@ -46,20 +70,20 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, python-format msgid "make sure to create password with minimal length of %d characters" msgstr "" "Asegúrese de crear una contraseña con una longitud mínima de %d caracteres" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" msgstr "" "no se puede comprobar la longitud de la contraseña raíz(la contraseña está " "encriptada)" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " -@@ -65,36 +66,44 @@ +@@ -68,13 +92,13 @@ "la contraseña de root es demasiado corta, se exige una más larga con al " "menos %d caracteres" --#: ../org_fedora_oscap/rule_handling.py:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, python-format msgid "package '%s' has been added to the list of to be installed packages" msgstr "paquete '%s' se ha añadido a la lista de paquetes a instalar" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -85,30 +109,30 @@ + "pero no puede ser quitado de selección actual de software sin romper la " + "instalación." + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, python-format msgid "package '%s' has been added to the list of excluded packages" msgstr "paquete '%s' se ha añadido a la lista de paquetes excluidos" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" msgstr "Se desactivará Kdump al inicio" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" msgstr "Se activará Kdump al inicio" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" msgstr "Se desactivará el cortafuegos al inicio" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" msgstr "Se activará el cortafuegos al inicio" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, python-format msgid "" "service '%s' has been added to the list of services to be added to the " -@@ -103,16 +112,16 @@ +@@ -117,16 +141,16 @@ "el servicio '%s' se ha añadido a la lista de servicios a añadir al " "cortafuegos" --#: ../org_fedora_oscap/rule_handling.py:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, python-format msgid "" "port '%s' has been added to the list of ports to be added to the firewall" msgstr "" "el puerto '%s' se ha añadido a la lista de puertos a añadir al cortafuegos" --#: ../org_fedora_oscap/rule_handling.py:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, python-format msgid "" "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -120,8 +129,8 @@ +@@ -134,8 +158,8 @@ "confiar%s'se ha agregado a la lista de fideicomisos que se agregarán al " "firewall" --#: ../org_fedora_oscap/rule_handling.py:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -151,44 +160,44 @@ +@@ -144,65 +168,78 @@ + "el servicio '%s' se ha añadido a la lista de servicios a quitar del " + "cortafuegos" + +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." + msgstr "" +-"Se produjo un error al obtener y cargar el contenido de seguridad:\n" +-"%s\n" +-"Debería pararse la instalación. ¿Quiere continuar de todas formas?" + +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../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." ++msgid "The integrity check of the security content failed." + msgstr "" +-"Falló la comprobación de integridad del contenido de seguridad.\n" +-"Debería pararse la instalación. ¿Quiere continuar de todas formas?" ++"Falló la comprobación de la integridad del contenido. No se puede usar el " ++"mismo." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++#, fuzzy ++#| msgid "Error fetching and loading content" ++msgid "There was an error fetching and loading the security content:\n" ++msgstr "Error al obtener y cargar el contenido" ++ ++#: ../org_fedora_oscap/ks/oscap.py:409 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:774 ++msgid "There was an unexpected problem with the supplied content." ++msgstr "" ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "Configuración errónea detectada" #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "_POLÍTICA DE SEGURIDAD" -+msgid "_Security Policy" -+msgstr "_Política de Seguridad" +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "_Política de Seguridad" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" msgstr "No está listo" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" msgstr "Obteniendo datos de contenido" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" msgstr "Ningún perfil seleccionado" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" msgstr "Ninguna regla para la fase de pre-instalación" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." msgstr "" "Contenido proporcionado inválido. Ingrese una URL diferente, por favor." --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 msgid "Invalid or unsupported content URL, please enter a different one." msgstr "" "La URL del contenido no es válida o no está admitida, por favor introduzca " "una nueva." --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." - msgstr "" - "Falló la obtención de contenido. Ingrese una URL diferente, por favor." +-msgstr "" +-"Falló la obtención de contenido. Ingrese una URL diferente, por favor." ++msgstr "Falló la obtención de contenido. Ingrese una URL diferente, por favor." --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." -@@ -196,19 +205,19 @@ +@@ -210,69 +247,68 @@ "Se produjo un error de red al obtener los datos. Compruebe que la red está " "configurada y en funcionamiento." --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 msgid "The integrity check of the content failed. Cannot use the content." msgstr "" "Falló la comprobación de la integridad del contenido. No se puede usar el " "mismo." --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, python-format msgid "Failed to extract content (%s). Enter a different URL, please." msgstr "" "Fallo al extraer el contenido(%s). Ingrese una URL diferente, por favor." --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," -@@ -216,49 +225,49 @@ +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" msgstr "" "El perfil con ID '%s' no está definido en el contenido. Elija uno diferente." --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" msgstr "No se aplica política de seguridad" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" - msgstr "" - "o ingrese el contenido de flujo de datos o archivo URL a continuación:" +-msgstr "" +-"o ingrese el contenido de flujo de datos o archivo URL a continuación:" ++msgstr "o ingrese el contenido de flujo de datos o archivo URL a continuación:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 msgid "" "No content found. Please enter data stream content or archive URL below:" msgstr "" - "No se encontró contenido. Por favor ingrese un contenido de flujo de datos o" - " un archivo a continuación:" +-"No se encontró contenido. Por favor ingrese un contenido de flujo de datos o" +-" un archivo a continuación:" ++"No se encontró contenido. Por favor ingrese un contenido de flujo de datos o " ++"un archivo a continuación:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" msgstr "Error al obtener y cargar el contenido" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" msgstr "No se encontró contenido" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" msgstr "Configuración errónea detectada" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" msgstr "Advertencias aparecieron" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" msgstr "Todo está bien" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" msgstr "URL no soportada o es inválida" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." msgstr "Obteniendo contenido..." -@@ -306,11 +315,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_Usar Guía de seguridad SCAP" - --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -323,3 +359,19 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" msgstr "_Obtener" -Binary files a/po/fr.mo and b/po/fr.mo differ -diff -U3 -N -r a/po/fr.po b/po/fr.po ---- a/po/fr.po 2020-06-02 14:21:08.000000000 +0200 -+++ b/po/fr.po 2021-02-15 11:32:20.362504514 +0100 -@@ -5,16 +5,16 @@ - # Translators: - # dominique bribanick , 2014 - # Jérôme Fenal , 2014 --# Jean-Baptiste Holcroft , 2016. #zanata - # Ludek Janda , 2018. #zanata - # Ludek Janda , 2019. #zanata -+# Ludek Janda , 2020. #zanata ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Se produjo un error al obtener y cargar el contenido de seguridad:\n" ++#~ "%s\n" ++#~ "Debería pararse la instalación. ¿Quiere continuar de todas formas?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Falló la comprobación de integridad del contenido de seguridad.\n" ++#~ "Debería pararse la instalación. ¿Quiere continuar de todas formas?" +diff -U3 -N -r a/po/fi.po b/po/fi.po +--- a/po/fi.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/fi.po 2021-07-16 11:11:54.663604756 +0200 +@@ -2,13 +2,15 @@ + # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. + # Ricky Tigg , 2021. ++# Robin Lahtinen , 2021. ++# Jan Kuparinen , 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2019-02-12 02:08+0000\n" --"Last-Translator: Ludek Janda \n" -+"POT-Creation-Date: 2020-07-09 17:35+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" - "Language: fr\n" - "MIME-Version: 1.0\n" -@@ -23,7 +23,7 @@ - "Plural-Forms: nplurals=2; plural=(n > 1);\n" - "X-Generator: Zanata 4.6.2\n" +-"POT-Creation-Date: 2020-08-27 15:51+0200\n" +-"PO-Revision-Date: 2021-06-04 11:03+0000\n" +-"Last-Translator: Ricky Tigg \n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" ++"PO-Revision-Date: 2021-07-02 12:16+0000\n" ++"Last-Translator: Jan Kuparinen \n" + "Language-Team: Finnish \n" + "Language: fi\n" +@@ -16,9 +18,34 @@ + "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.7.1\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "Virhe purettaessa arkistoa zip-tiedostona: {exc}" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, 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. - {hash_obj.name} tarkiste ei ollut " ++"oikein" ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -32,10 +32,10 @@ - msgstr "" - "{0} doit être sur une partition ou un volume logique séparé et doit être " - "créé dans la structure de partitionnement avant que l'installation puisse " --"avoir lieu avec un profil de sécurité." -+"avoir lieu avec un profil de sécurité" +@@ -30,24 +57,24 @@ + "turvallisuusprofiilin kanssa" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -44,21 +44,21 @@ - "%(mount_point)s" + msgstr "Liitoskohta '%(mount_option)s' lisätty liitoskohtaan %(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, 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" + msgstr "Salasana luodessa, varmista, että siinä on vähintään %d merkkiä" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 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é)" + msgstr "ei voi tarkistaa rootin salasanan pituutta (salasana on salattu)" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " -@@ -67,36 +67,47 @@ - "le mot de passe de root est trop court, une longueur d'au moins %d " - "caractères est requise" +@@ -56,13 +83,13 @@ + "rootin salasana on liian lyhyt, tarvitaan pidempi salasana, jossa on " + "vähintään %d merkkiä" --#: ../org_fedora_oscap/rule_handling.py:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, 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" + msgstr "paketti '%s' on lisätty asennettavien pakettien luetteloon" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+"le paquet {package}été ajouté à la liste des paquets exclus, mais il ne peut" -+" pas être retiré de la sélection actuelle des logiciels sans interrompre " -+"l'installation." -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -72,53 +99,53 @@ + "paketti '{package}' on lisätty poissuljettujen pakettien luetteloon, mutta " + "sitä ei voida poistaa nykyisestä ohjelmistovalinnasta rikkomatta asennusta." + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, 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" + msgstr "paketti '%s' on lisätty poissuljettujen pakettien luetteloon" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" - msgstr "Kdump va être désactivé au démarrage" + msgstr "Kdump poistetaan käytöstä käynnistettäessä" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" - msgstr "Kdump va être activé au démarrage" + msgstr "Kdump otetaan käyttöön käynnistyksen yhteydessä" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" - msgstr "Le pare-feu va être désactivé au démarrage" + msgstr "Palomuuri poistetaan käytöstä käynnistyksen yhteydessä" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" - msgstr "Le pare-feu va être activé au démarrage" + msgstr "Palomuuri otetaan käyttöön käynnistyksen yhteydessä" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, python-format msgid "" "service '%s' has been added to the list of services to be added to the " -@@ -104,23 +115,23 @@ - msgstr "" - "service « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" + "firewall" + msgstr "palvelu '%s' on lisätty palomuuriin lisättävien palvelujen luetteloon" --#: ../org_fedora_oscap/rule_handling.py:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, 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" + msgstr "portti '%s' on lisätty palomuuriin lisättävien porttien luetteloon" --#: ../org_fedora_oscap/rule_handling.py:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, 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" + "luottamus '%s' on lisätty palomuuriin lisättävien luotettavuuksien luetteloon" --#: ../org_fedora_oscap/rule_handling.py:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -149,43 +160,43 @@ +@@ -126,61 +153,67 @@ + msgstr "" + "palvelu '%s' on lisätty palomuurista poistettavien palvelujen luetteloon" + +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +-"Turvallisuussisällön noutamisessa ja lataamisessa tapahtui virhe:\n" +-"%s\n" +-"Asennus on keskeytettävä. Haluatko jatkaa joka tapauksessa?" +- +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +-"Turvallisuussisällön eheyden tarkistus epäonnistui.\n" +-"Asennus on keskeytettävä. Haluatko jatkaa joka tapauksessa?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." ++msgstr "Asennus pitäisi keskeyttää." ++ ++#: ../org_fedora_oscap/ks/oscap.py:377 ++msgid "Do you wish to continue anyway?" ++msgstr "Haluatko silti jatkaa?" ++ ++#: ../org_fedora_oscap/ks/oscap.py:400 ++msgid "The integrity check of the security content failed." ++msgstr "Sisällön tietoturvasisällön eheyden tarkistus epäonnistui." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++msgid "There was an error fetching and loading the security content:\n" ++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 ++msgid "There was an unexpected problem with the supplied content." ++msgstr "Toimitetun sisällön kohdalla oli odottamaton ongelma." ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++msgid "Wrong configuration detected!" ++msgstr "Virheellinen määritys havaittu!" #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "_POLITIQUE DE SÉCURITÉ" -+msgid "_Security Policy" -+msgstr "_Politique de sécurité" +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "_Turvallisuuskäytäntö" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" - msgstr "Pas prêt" + msgstr "Ei valmis" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" - msgstr "Récupération des données de contenu" + msgstr "Haetaan sisältötietoja" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" - msgstr "Aucun profil sélectionné" + msgstr "Ei profiilia valittuna" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" - msgstr "Aucune règle pour la phase de pré-installation" + msgstr "Ei sääntöjä asennusta edeltävää vaihetta varten" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." - msgstr "Contenu fourni invalide. Merci de saisir une URL différente." + msgstr "Virheellinen sisältö annettuna. Syötä toinen URL." --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 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." + msgstr "Virheellinen tai ei-tuettu sisällön URL. Syötä toinen." --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 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." + msgstr "Sisällön noutaminen epäonnistui. Syötä toinen URL." --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." -@@ -193,70 +204,70 @@ - "Erreur de réseau lors de l'extraction des données. Veuillez vérifier que le " - "réseau ait été installé et fonctionne correctement." +@@ -188,16 +221,16 @@ + "Verkkovirhe kohdattu tietoja noudettaessa. Tarkista, että verkko on " + "määritetty ja toimii." --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 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." + msgstr "Sisällön eheyden tarkistus epäonnistui. Sisältöä ei voi käyttää." --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, 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." + msgstr "Sisällön (%s) purkaminen epäonnistui. Syötä toinen URL." --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" - msgstr "" - "Le profil ayant pour ID « %s »n'est pas défini dans le contenu. Sélectionner" --" un autre profil, s'il vous plaît." -+" un autre profil, s'il vous plaît" + "Profile with ID '%s' not defined in the content. Select a different profile, " +@@ -206,46 +239,46 @@ + "Profiilia, jonka tunnus on '%s', ei ole määritelty sisällössä. Valitse " + "toinen profiili" --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" - msgstr "N'applique pas la politique de sécurité" + msgstr "Ei sovelleta turvallisuuskäytäntöä" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 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 :" -+" ou saisir un flux de données de contenu ou l'URL d'une archive ci-dessous :" + msgstr " tai syötä tietovirran sisältö tai arkiston URL alle:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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 :" + msgstr "Sisältöä ei löytynyt. Syötä tietovirran sisältö tai arkiston URL alle:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" - msgstr "Erreur d'extraction et de chargement du contenu" + msgstr "Virhe sisällön noutamisessa ja lataamisessa" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" - msgstr "Contenu introuvable" + msgstr "Sisältöä ei löytynyt" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" - msgstr "Mauvaise configuration détectée" + msgstr "Virheellinen määritys havaittu" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" - msgstr "Des avertissements sont apparus" + msgstr "Varoitukset ilmestyivät" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" - msgstr "Tout est OK" + msgstr "Kaikki hyvin" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" - msgstr "URL invalide ou non prise en charge" + msgstr "Virheellinen tai tuettu URL" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." - msgstr "Récupération du contenu..." + msgstr "Noudetaan sisältöä ..." -@@ -270,7 +281,7 @@ - - #: tmp/oscap.glade.h:3 - msgid "Apply security policy:" --msgstr "Application des politiques de sécurité :" -+msgstr "Application de la politique de sécurité :" - - #: tmp/oscap.glade.h:4 - msgid "Data stream:" -@@ -304,11 +315,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_Utiliser le guide de sécurité SCAP" - --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -296,3 +329,19 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" - msgstr "_Récupérer" -Binary files a/po/hu.mo and b/po/hu.mo differ -diff -U3 -N -r a/po/hu.po b/po/hu.po ---- a/po/hu.po 2020-06-02 14:21:14.000000000 +0200 -+++ b/po/hu.po 2021-02-15 11:32:20.362504514 +0100 -@@ -4,13 +4,16 @@ - # - # Translators: - # Zoltan Hoppár , 2014 -+# Teknős Ferenc , 2018. #zanata -+# Teknős Ferenc , 2019. #zanata -+# Teknős Ferenc , 2020. #zanata - msgid "" + msgstr "_Nouda" ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Turvallisuussisällön noutamisessa ja lataamisessa tapahtui virhe:\n" ++#~ "%s\n" ++#~ "Asennus on keskeytettävä. Haluatko jatkaa joka tapauksessa?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Turvallisuussisällön eheyden tarkistus epäonnistui.\n" ++#~ "Asennus on keskeytettävä. Haluatko jatkaa joka tapauksessa?" +diff -U3 -N -r a/po/fr.po b/po/fr.po +--- a/po/fr.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/fr.po 2021-07-16 11:11:54.663604756 +0200 +@@ -12,10 +12,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2015-04-02 03:06+0000\n" --"Last-Translator: Copied by Zanata \n" -+"POT-Creation-Date: 2020-07-09 17:35+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" - "Language: hu\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\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" ++"Language-Team: French (http://www.transifex.com/projects/p/oscap-anaconda-" ++"addon/language/fr/)\n" + "Language: fr\n" "MIME-Version: 1.0\n" -@@ -19,16 +22,19 @@ - "Plural-Forms: nplurals=2; plural=(n != 1);\n" + "Content-Type: text/plain; charset=UTF-8\n" +@@ -23,7 +24,31 @@ + "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, fuzzy, python-brace-format ++#| msgid "The integrity check of the content failed. Cannot use the content." ++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." ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, 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 "" -+"A {0} -nek külön partíción vagy logikai köteten kell lennie, és létre kell " -+"hoznia a particionálási elrendezésben, mielőtt a telepítés megtörténhet " -+"biztonsági profilon" +@@ -35,7 +60,7 @@ + "avoir lieu avec un profil de sécurité" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -37,80 +43,95 @@ +@@ -44,21 +69,21 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, 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" + msgstr "" + "assurez-vous de créer un mot de passe d'une longueur minimale de %d " + "caractères" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" - msgstr "root jelszó hosszúsága nem ellenőrzhető (jelszó titkosított)" + 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:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " - "required" - msgstr "" -+"root jelszó túl rövid, de hosszabbnak kell lennie legalább %d karakterrel" +@@ -67,47 +92,47 @@ + "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:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, 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" + msgstr "le paquet « %s » a été ajouté à la liste des paquets à installer" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, 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 "" +-"le paquet {package}été ajouté à la liste des paquets exclus, mais il ne peut" +-" pas être retiré de la sélection actuelle des logiciels sans interrompre " ++"le paquet {package}été ajouté à la liste des paquets exclus, mais il ne peut " ++"pas être retiré de la sélection actuelle des logiciels sans interrompre " + "l'installation." + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, 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" + msgstr "le paquet « %s » a été ajouté à la liste des paquets à exclure" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" --msgstr "" -+msgstr "A Kdump indításkor le lesz tiltva" + msgstr "Kdump va être désactivé au démarrage" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" --msgstr "" -+msgstr "A Kdump indításkor engedélyezve lesz" + msgstr "Kdump va être activé au démarrage" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" --msgstr "" -+msgstr "A tűzfal indításkor le lesz tiltva" + msgstr "Le pare-feu va être désactivé au démarrage" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" --msgstr "" -+msgstr "A tűzfal engedélyezve lesz az indításkor" + msgstr "Le pare-feu va être activé au démarrage" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, python-format msgid "" "service '%s' has been added to the list of services to be added to the " - "firewall" +@@ -115,23 +140,22 @@ msgstr "" -+"szolgáltatás \"%s\" lett hozzáadva a tűzfalhoz hozzáadandó szolgáltatások " -+"listájához" + "service « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" --#: ../org_fedora_oscap/rule_handling.py:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, python-format msgid "" "port '%s' has been added to the list of ports to be added to the firewall" --msgstr "" -+msgstr "port \"%s\" lett hozzáadva a tűzfalhoz hozzáadandó portok listájához" + msgstr "port « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" --#: ../org_fedora_oscap/rule_handling.py:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, python-format msgid "" "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "" -+"a \"%s\" szolgáltatás hozzá lett adva a tűzfalhoz hozzáadandó megbízhatók " -+"listájához" +-msgstr "" +-"trust « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" ++msgstr "trust « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" --#: ../org_fedora_oscap/rule_handling.py:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " - "firewall" +@@ -139,64 +163,78 @@ msgstr "" -+"szolgáltatás \"%s\" lett hozzáadva a tűzfalról eltávolítandó szolgáltatások " -+"listájához" + "service « %s » a été ajouté à la liste des paquets à retirer du pare-feu" - #: ../org_fedora_oscap/ks/oscap.py:418 - #, python-format -@@ -119,119 +140,131 @@ - "%s\n" - "The installation should be aborted. Do you wish to continue anyway?" +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." msgstr "" -+"Hiba történt a biztonsági tartalom lekérése és betöltése során:\n" -+"%s\n" -+"A telepítést meg kell szakítani. Szeretné folytatni?" +-"Il y a eu une erreur lors de l'extraction et du chargement du contenu de sécurité :\n" +-"%s\n" +-"L'installation doit être interrompue. Souhaitez-vous continuer quand même ?" - #: ../org_fedora_oscap/ks/oscap.py:447 - msgid "" - "The integrity check of the security content failed.\n" - "The installation should be aborted. Do you wish to continue anyway?" +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../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." ++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." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++#, fuzzy ++#| msgid "Error fetching and loading content" ++msgid "There was an error fetching and loading the security content:\n" ++msgstr "Erreur d'extraction et de chargement du contenu" ++ ++#: ../org_fedora_oscap/ks/oscap.py:409 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:774 ++msgid "There was an unexpected problem with the supplied content." msgstr "" -+"A biztonsági tartalom integritásának ellenőrzése sikertelen.\n" -+"A telepítést meg kell szakítani. Szeretné folytatni?" +-"Le contrôle d'intégrité du contenu de sécurité a échoué.\n" +-"L'installation doit être interrompue. Souhaitez-vous continuer quand même ?" ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "Mauvaise configuration détectée" #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "" -+msgid "_Security Policy" -+msgstr "_Biztonsági házirend" +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "_Politique de sécurité" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" - msgstr "Nincs még kész" + msgstr "Pas prêt" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" - msgstr "Adatok letöltése" + msgstr "Récupération des données de contenu" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" - msgstr "Nincs profil kiválasztva" + msgstr "Aucun profil sélectionné" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" - msgstr "Nincsenek szabályok felállítva az előkészítési fázishoz" + msgstr "Aucune règle pour la phase de pré-installation" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 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." + msgstr "Contenu fourni invalide. Merci de saisir une URL différente." --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 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." + "URL de contenu non prise en charge ou non valide, veuillez saisir une URL " + "différente." --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Tartalom letöltése sikertelen. Kérem, adjon meg másik URL-t." + msgstr "" + "Échec de la récupération du contenu. Merci de saisir une URL différente." --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." - msgstr "" -+"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ő." +@@ -204,70 +242,70 @@ + "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:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 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ó." + "Le contrôle d'intégrité du contenu a échoué. Impossible d'utiliser le " + "contenu." --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, 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." + msgstr "" + "Impossible d'extraire le contenu (%s). Merci de saisir une URL différente." --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" msgstr "" -+"A (z) \"%s\" azonosítójú profil nem szerepel a tartalomban. Kérem válasszon " -+"másik profilt" +-"Le profil ayant pour ID « %s »n'est pas défini dans le contenu. Sélectionner" +-" un autre profil, s'il vous plaît" ++"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:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" --msgstr "" -+msgstr "Nem alkalmazható a biztonsági házirend" + msgstr "N'applique pas la politique de sécurité" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" - msgstr "vagy adjon meg adathalmazt, vagy archiv URL-t alább:" + 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:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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:" + "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:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" --msgstr "" -+msgstr "Hiba történt a tartalom lekérése és betöltése során" + msgstr "Erreur d'extraction et de chargement du contenu" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" - msgstr "Tartalom nem található" + msgstr "Contenu introuvable" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" - msgstr "Helytelen beállítások észlelve" + msgstr "Mauvaise configuration détectée" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" - msgstr "Figyelmeztetések jelentek meg" + msgstr "Des avertissements sont apparus" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" - msgstr "Minden rendben" + msgstr "Tout est OK" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" - msgstr "Rossz vagy nem támogatott URL" + msgstr "URL invalide ou non prise en charge" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." - msgstr "Tartalom letöltése..." - - #: tmp/oscap.glade.h:1 - msgid "SECURITY POLICY" --msgstr "" -+msgstr "BIZTONSÁGI HÁZIREND" - - #: tmp/oscap.glade.h:2 - msgid "_Change content" -@@ -239,7 +272,7 @@ - - #: tmp/oscap.glade.h:3 - msgid "Apply security policy:" --msgstr "Biztonsági szabályzat alkalmazása:" -+msgstr "Biztonsági házirend alkalmazása:" - - #: tmp/oscap.glade.h:4 - msgid "Data stream:" -@@ -273,11 +306,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "SCAP Biztonsági könyv előírásainak használata" + msgstr "Récupération du contenu..." --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -318,3 +356,22 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" - msgstr "Letöltés" -Binary files a/po/it.mo and b/po/it.mo differ -diff -U3 -N -r a/po/it.po b/po/it.po ---- a/po/it.po 2020-06-02 14:21:18.000000000 +0200 -+++ b/po/it.po 2021-02-15 11:32:20.362504514 +0100 -@@ -1,21 +1,22 @@ --# Ludek Janda , 2018. #zanata - # Ludek Janda , 2019. #zanata -+# Silvio Berger , 2020. - msgid "" + msgstr "_Récupérer" ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Il y a eu une erreur lors de l'extraction et du chargement du contenu de " ++#~ "sécurité :\n" ++#~ "%s\n" ++#~ "L'installation doit être interrompue. Souhaitez-vous continuer quand " ++#~ "même ?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Le contrôle d'intégrité du contenu de sécurité a échoué.\n" ++#~ "L'installation doit être interrompue. Souhaitez-vous continuer quand " ++#~ "même ?" +diff -U3 -N -r a/po/hu.po b/po/hu.po +--- a/po/hu.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/hu.po 2021-07-16 11:11:54.663604756 +0200 +@@ -11,10 +11,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2019-02-12 02:17+0000\n" --"Last-Translator: Ludek Janda \n" --"Language-Team: \n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2020-11-19 21:35+0000\n" -+"Last-Translator: Silvio Berger \n" -+"Language-Team: Italian \n" - "Language: it\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\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" ++"Language-Team: Hungarian (http://www.transifex.com/projects/p/oscap-anaconda-" ++"addon/language/hu/)\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.3.2\n" +@@ -22,7 +23,31 @@ + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, fuzzy, python-brace-format ++#| msgid "The integrity check of the content failed. Cannot use the content." ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "" ++"Nem sikerült a tartalom integritásának ellenőrzése. A tartalom nem " ++"használható." ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -27,7 +28,7 @@ - "avvenire con un profilo di sicurezza" +@@ -34,7 +59,7 @@ + "biztonsági profilon" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -36,20 +37,20 @@ +@@ -43,17 +68,17 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, python-format msgid "make sure to create password with minimal length of %d characters" - msgstr "" - "assicurati di creare una password con una lunghezza minima di %d personaggi" + msgstr "bizonyosodjon meg arról, hogy %d karakter hosszúságú jelszót ad meg" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" - msgstr "" - "impossibile controllare la lunghezza della password di root (la password è " - "criptata)" + msgstr "root jelszó hosszúsága nem ellenőrzhető (jelszó titkosított)" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " -@@ -58,36 +59,44 @@ - "la password di root è troppo breve, più lunga con almeno %d i caratteri sono" - " obbligatori" +@@ -61,13 +86,13 @@ + msgstr "" + "root jelszó túl rövid, de hosszabbnak kell lennie legalább %d karakterrel" --#: ../org_fedora_oscap/rule_handling.py:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, python-format msgid "package '%s' has been added to the list of to be installed packages" - msgstr "pacchetto '%s'è stato aggiunto all'elenco dei pacchetti da installare" + msgstr "'%s' csomag hozzáadásra került a telepítendő csomagok listájához" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -75,30 +100,30 @@ + "installation." + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, python-format msgid "package '%s' has been added to the list of excluded packages" - msgstr "pacchetto '%s'è stato aggiunto all'elenco dei pacchetti esclusi" + msgstr "'%s' csomag hozzáadásra került az eltávolítandó csomagok listájához" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" - msgstr "Kdump sarà disabilitato all'avvio" + msgstr "A Kdump indításkor le lesz tiltva" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" - msgstr "Kdump sarà abilitato all'avvio" + msgstr "A Kdump indításkor engedélyezve lesz" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" - msgstr "Il firewall sarà disabilitato all'avvio" + msgstr "A tűzfal indításkor le lesz tiltva" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" - msgstr "Il firewall sarà abilitato all'avvio" + msgstr "A tűzfal engedélyezve lesz az indításkor" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, python-format msgid "" "service '%s' has been added to the list of services to be added to the " -@@ -96,24 +105,24 @@ - "servizio '%s'è stato aggiunto all'elenco dei servizi da aggiungere al " - "firewall" +@@ -107,15 +132,15 @@ + "szolgáltatás \"%s\" lett hozzáadva a tűzfalhoz hozzáadandó szolgáltatások " + "listájához" --#: ../org_fedora_oscap/rule_handling.py:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, python-format msgid "" "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "" - "porto%s'è stato aggiunto all'elenco delle porte da aggiungere al firewall" + msgstr "port \"%s\" lett hozzáadva a tűzfalhoz hozzáadandó portok listájához" --#: ../org_fedora_oscap/rule_handling.py:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, python-format msgid "" "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "" - "fiducia '%s'è stato aggiunto all'elenco dei trust da aggiungere al firewall" +@@ -123,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:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -143,41 +152,41 @@ +@@ -133,63 +158,76 @@ + "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:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." + msgstr "" +-"Hiba történt a biztonsági tartalom lekérése és betöltése során:\n" +-"%s\n" +-"A telepítést meg kell szakítani. Szeretné folytatni?" + +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../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." ++msgid "The integrity check of the security content failed." ++msgstr "" ++"Nem sikerült a tartalom integritásának ellenőrzése. A tartalom nem " ++"használható." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++#, 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 ++msgid "There was an unexpected problem with the supplied content." + msgstr "" +-"A biztonsági tartalom integritásának ellenőrzése sikertelen.\n" +-"A telepítést meg kell szakítani. Szeretné folytatni?" ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "Helytelen beállítások észlelve" #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "_POLITICA DI SICUREZZA" -+msgid "_Security Policy" -+msgstr "_Policy di Sicurezza" +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "_Biztonsági házirend" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" - msgstr "Non pronto" + msgstr "Nincs még kész" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" - msgstr "Recupero dei dati di contenuto" + msgstr "Adatok letöltése" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" - msgstr "Nessun profilo selezionato" + msgstr "Nincs profil kiválasztva" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" - msgstr "Nessuna regola per la fase di pre-installazione" + msgstr "Nincsenek szabályok felállítva az előkészítési fázishoz" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." - msgstr "Contenuto non valido fornito. Inserisci un URL diverso, per favore." +-msgstr "" +-"Helytelen tartalom került megadásra. Kérem, adjon meg egy másik URL-t." ++msgstr "Helytelen tartalom került megadásra. Kérem, adjon meg egy másik URL-t." --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "URL di contenuto non valido o non supportato, inserisci uno diverso." + msgstr "" + "Érvénytelen vagy nem támogatott tartalom URL, kérjük, írjon be másikat." --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." - msgstr "" - "Impossibile recuperare il contenuto. Inserisci un URL diverso, per favore." + msgstr "Tartalom letöltése sikertelen. Kérem, adjon meg másik URL-t." --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." -@@ -185,20 +194,20 @@ - "Errore di rete rilevato durante il recupero dei dati. Si prega di verificare" - " che la rete sia configurata e funzionante." +@@ -197,68 +235,68 @@ + "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:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 msgid "The integrity check of the content failed. Cannot use the content." msgstr "" - "Il controllo di integrità del contenuto non è riuscito. Non posso usare il " - "contenuto." + "Nem sikerült a tartalom integritásának ellenőrzése. A tartalom nem " + "használható." --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, python-format msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "" - "Impossibile estrarre il contenuto (%s). Inserisci un URL diverso, per " - "favore." + msgstr "Tartalom kibontása sikertelen (%s). Kérem, adjon meg másik URL-t." --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," -@@ -207,50 +216,50 @@ - "Profilo con ID '%s'non definito nel contenuto. Seleziona un profilo diverso," - " per favore" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" + msgstr "" + "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:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" - msgstr "Non applicare la politica di sicurezza" + 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:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" - msgstr "" - " oppure inserisci il contenuto del flusso di dati o l'URL di archivio di " - "seguito:" + msgstr "vagy adjon meg adathalmazt, vagy archiv URL-t alább:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 msgid "" "No content found. Please enter data stream content or archive URL below:" msgstr "" - "Nessun contenuto trovato. Inserisci il contenuto del flusso di dati o l'URL " - "di archiviazione di seguito:" + "Tartalom nem található. Kérem adjon meg egy adathalmazt, vagy archív URL-t " + "alább:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" - msgstr "Errore durante il recupero e il caricamento del contenuto" + msgstr "Hiba történt a tartalom lekérése és betöltése során" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" - msgstr "Nessun contenuto trovato" + msgstr "Tartalom nem található" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" - msgstr "Rilevata errata configurazione" + msgstr "Helytelen beállítások észlelve" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" - msgstr "Sono apparsi avvertimenti" + msgstr "Figyelmeztetések jelentek meg" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" - msgstr "Tutto ok" + msgstr "Minden rendben" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" - msgstr "URL non valido o non supportato" + msgstr "Rossz vagy nem támogatott URL" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." - msgstr "Recupero del contenuto ..." - -@@ -298,11 +307,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_Usare Guida alla sicurezza di SCAP" + msgstr "Tartalom letöltése..." --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -309,3 +347,19 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" - msgstr "_Ottenere" -Binary files a/po/ja.mo and b/po/ja.mo differ -diff -U3 -N -r a/po/ja.po b/po/ja.po ---- a/po/ja.po 2020-06-02 14:21:19.000000000 +0200 -+++ b/po/ja.po 2021-02-15 11:32:20.362504514 +0100 -@@ -1,22 +1,24 @@ --# Ooyama Yosiyuki , 2015. #zanata -+# Ludek Janda , 2017. #zanata - # Ludek Janda , 2018. #zanata - # Ludek Janda , 2020. #zanata -+# Sundeep Anand , 2021. - msgid "" + msgstr "Letöltés" ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Hiba történt a biztonsági tartalom lekérése és betöltése során:\n" ++#~ "%s\n" ++#~ "A telepítést meg kell szakítani. Szeretné folytatni?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "A biztonsági tartalom integritásának ellenőrzése sikertelen.\n" ++#~ "A telepítést meg kell szakítani. Szeretné folytatni?" +diff -U3 -N -r a/po/it.po b/po/it.po +--- a/po/it.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/it.po 2021-07-16 11:11:54.663604756 +0200 +@@ -4,11 +4,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2020-03-10 01:40+0000\n" --"Last-Translator: Ludek Janda \n" --"Language-Team: Japanese\n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2021-02-12 10:40+0000\n" -+"Last-Translator: Sundeep Anand \n" -+"Language-Team: Japanese \n" - "Language: ja\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" + "PO-Revision-Date: 2020-11-19 21:35+0000\n" + "Last-Translator: Silvio Berger \n" +-"Language-Team: Italian \n" ++"Language-Team: Italian \n" + "Language: it\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.4.2\n" +@@ -16,7 +16,31 @@ + "Plural-Forms: nplurals=2; plural=n != 1;\n" + "X-Generator: Weblate 4.3.2\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, fuzzy, python-brace-format ++#| msgid "The integrity check of the content failed. Cannot use the content." ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "" ++"Il controllo di integrità del contenuto non è riuscito. Non posso usare il " ++"contenuto." ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -27,82 +29,92 @@ - "は、別のパーティションもしくは論理ボリューム上になければなりません。また、セキュリティープロファイルがインストールされる前にパーティションレイアウトに作成されなければなりません" +@@ -28,7 +52,7 @@ + "avvenire con un profilo di sicurezza" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" - msgstr "マウントオプション '%(mount_option)s' が、マウントポイント %(mount_point)s に追加されました" +@@ -37,35 +61,35 @@ + "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, python-format msgid "make sure to create password with minimal length of %d characters" --msgstr "%d 文字以上のパスワードを作成してください。" -+msgstr "%d 文字以上のパスワードを作成してください" + msgstr "" + "assicurati di creare una password con una lunghezza minima di %d personaggi" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" - msgstr "root パスワードの長さを確認できません (パスワードは暗号化済み)" + msgstr "" + "impossibile controllare la lunghezza della password di root (la password è " + "criptata)" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " "required" --msgstr "root のパスワードが短すぎます。%d 文字以上にする必要があります。" -+msgstr "root のパスワードが短すぎます。%d 文字以上にする必要があります" + msgstr "" +-"la password di root è troppo breve, più lunga con almeno %d i caratteri sono" +-" obbligatori" ++"la password di root è troppo breve, più lunga con almeno %d i caratteri sono " ++"obbligatori" --#: ../org_fedora_oscap/rule_handling.py:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, python-format msgid "package '%s' has been added to the list of to be installed packages" - msgstr "パッケージ '%s' が、インストール予定パッケージ一覧に追加されました" + msgstr "pacchetto '%s'è stato aggiunto all'elenco dei pacchetti da installare" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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}' " -+"が除外パッケージのリストに追加されましたが、インストールを中断せずに現在のソフトウェアの選択から削除することはできません。" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -73,30 +97,30 @@ + "installation." + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, python-format msgid "package '%s' has been added to the list of excluded packages" - msgstr "パッケージ '%s' が、除外パッケージ一覧に追加されました" + msgstr "pacchetto '%s'è stato aggiunto all'elenco dei pacchetti esclusi" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" - msgstr "Kdump は起動時に無効になります" + msgstr "Kdump sarà disabilitato all'avvio" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" - msgstr "Kdump は起動時に有効になります" + msgstr "Kdump sarà abilitato all'avvio" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" - msgstr "ファイアウォールは起動時に無効になります" + msgstr "Il firewall sarà disabilitato all'avvio" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" - msgstr "ファイアウォールは起動時に有効になります" + msgstr "Il firewall sarà abilitato all'avvio" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, python-format msgid "" "service '%s' has been added to the list of services to be added to the " +@@ -105,24 +129,24 @@ + "servizio '%s'è stato aggiunto all'elenco dei servizi da aggiungere al " "firewall" - msgstr "サービス '%s' が、ファイアウォールに追加予定のサービス一覧に追加されました" --#: ../org_fedora_oscap/rule_handling.py:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, python-format msgid "" "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "ポート '%s' が、ファイアウォールに追加予定のポート一覧に追加されました" + msgstr "" + "porto%s'è stato aggiunto all'elenco delle porte da aggiungere al firewall" --#: ../org_fedora_oscap/rule_handling.py:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, python-format msgid "" "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "トラスト '%s' が、ファイアウォールに追加予定のトラスト一覧に追加されました" + msgstr "" + "fiducia '%s'è stato aggiunto all'elenco dei trust da aggiungere al firewall" --#: ../org_fedora_oscap/rule_handling.py:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -130,101 +142,101 @@ +@@ -131,135 +155,148 @@ + "servizio '%s'è stato aggiunto all'elenco dei servizi da rimuovere dal " + "firewall" - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" -+msgid "_Security Policy" - msgstr "セキュリティーポリシー(_S)" +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." + msgstr "" +-"Si è verificato un errore durante il recupero e il caricamento del contenuto" +-" di sicurezza:%sL'installazione dovrebbe essere interrotta. Vuoi continuare " +-"comunque?" + +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../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." ++msgid "The integrity check of the security content failed." ++msgstr "" ++"Il controllo di integrità del contenuto non è riuscito. Non posso usare il " ++"contenuto." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++#, fuzzy ++#| msgid "Error fetching and loading content" ++msgid "There was an error fetching and loading the security content:\n" ++msgstr "Errore durante il recupero e il caricamento del contenuto" ++ ++#: ../org_fedora_oscap/ks/oscap.py:409 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:774 ++msgid "There was an unexpected problem with the supplied content." + msgstr "" +-"Il controllo di integrità del contenuto di sicurezza non è riuscito. " +-"L'installazione dovrebbe essere interrotta. Vuoi continuare comunque?" ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "Rilevata errata configurazione" + + #. title of the spoke (will be displayed on the hub) +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "_Policy di Sicurezza" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" - msgstr "準備ができていません" + msgstr "Non pronto" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" - msgstr "コンテンツデータの取得中" + msgstr "Recupero dei dati di contenuto" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" - msgstr "選択されたプロファイルはありません" + msgstr "Nessun profilo selezionato" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" - msgstr "プレインストールフェーズのルールがありません" + msgstr "Nessuna regola per la fase di pre-installazione" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." - msgstr "無効なコンテンツが入力されました。別の URL を入力してください。" + msgstr "Contenuto non valido fornito. Inserisci un URL diverso, per favore." --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "コンテンツ URL が無効またはサポートされていません。別の URL を入力していません。" + msgstr "URL di contenuto non valido o non supportato, inserisci uno diverso." --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." - msgstr "コンテンツの取得に失敗しました。別の URL を入力してください。" + msgstr "" + "Impossibile recuperare il contenuto. Inserisci un URL diverso, per favore." --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." - msgstr "データの取得時にネットワークエラーが発生しました。ネットワークが設定されており、動作していることを確認してください。" + msgstr "" +-"Errore di rete rilevato durante il recupero dei dati. Si prega di verificare" +-" che la rete sia configurata e funzionante." ++"Errore di rete rilevato durante il recupero dei dati. Si prega di verificare " ++"che la rete sia configurata e funzionante." --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 msgid "The integrity check of the content failed. Cannot use the content." - msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。" + msgstr "" + "Il controllo di integrità del contenuto non è riuscito. Non posso usare il " + "contenuto." --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, python-format msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "コンテンツ (%s) の抽出に失敗しました。別の URL を入力してください。" + msgstr "" +-"Impossibile estrarre il contenuto (%s). Inserisci un URL diverso, per " +-"favore." ++"Impossibile estrarre il contenuto (%s). Inserisci un URL diverso, per favore." --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" --msgstr "コンテンツで ID が '%s' のプロファイルが定義されていません。別のプロファイルを選択してください。" -+msgstr "コンテンツで ID が '%s' のプロファイルが定義されていません。別のプロファイルを選択してください" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" + msgstr "" +-"Profilo con ID '%s'non definito nel contenuto. Seleziona un profilo diverso," +-" per favore" ++"Profilo con ID '%s'non definito nel contenuto. Seleziona un profilo diverso, " ++"per favore" --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" - msgstr "セキュリティーポリシーを適用しない" + msgstr "Non applicare la politica di sicurezza" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" --msgstr "または、以下にデータストリームコンテンツもしくはアーカイブの URL を入力します。" -+msgstr " または、以下にデータストリームコンテンツもしくはアーカイブの URL を入力します:" + msgstr "" + " oppure inserisci il contenuto del flusso di dati o l'URL di archivio di " + "seguito:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 msgid "" "No content found. Please enter data stream content or archive URL below:" --msgstr "コンテンツが見つかりませんでした。以下にデータストリームコンテンツもしくはアーカイブの URL を入力してください。" -+msgstr "コンテンツが見つかりませんでした。以下にデータストリームコンテンツもしくはアーカイブの URL を入力してください:" + msgstr "" + "Nessun contenuto trovato. Inserisci il contenuto del flusso di dati o l'URL " + "di archiviazione di seguito:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" - msgstr "コンテンツの取得およびロードのエラー" + msgstr "Errore durante il recupero e il caricamento del contenuto" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" - msgstr "コンテンツが見つかりませんでした" + msgstr "Nessun contenuto trovato" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" - msgstr "設定ミスが検出されました" + msgstr "Rilevata errata configurazione" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" - msgstr "警告が表示されました" + msgstr "Sono apparsi avvertimenti" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" - msgstr "すべて OK" + msgstr "Tutto ok" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" - msgstr "無効またはサポートされていない URL" + msgstr "URL non valido o non supportato" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." - msgstr "コンテンツの取得中..." - -@@ -266,17 +278,12 @@ - - #: tmp/oscap.glade.h:10 - msgid "Changes that were done or need to be done:" --msgstr "完了済みの変更または必要な変更" -+msgstr "完了済みの変更または必要な変更:" - - #: tmp/oscap.glade.h:11 - msgid "_Use SCAP Security Guide" - msgstr "SCAP セキュリティーガイドを使用する(_U)" + msgstr "Recupero del contenuto ..." --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -310,3 +347,19 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" - msgstr "取得(_F)" -Binary files a/po/ko.mo and b/po/ko.mo differ -diff -U3 -N -r a/po/ko.po b/po/ko.po ---- a/po/ko.po 2020-06-02 14:21:23.000000000 +0200 -+++ b/po/ko.po 2021-02-15 11:32:20.362504514 +0100 -@@ -1,10 +1,11 @@ - # Ludek Janda , 2018. #zanata -+# Ludek Janda , 2020. #zanata - msgid "" + msgstr "_Ottenere" ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Si è verificato un errore durante il recupero e il caricamento del " ++#~ "contenuto di sicurezza:%sL'installazione dovrebbe essere interrotta. Vuoi " ++#~ "continuare comunque?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Il controllo di integrità del contenuto di sicurezza non è riuscito. " ++#~ "L'installazione dovrebbe essere interrotta. Vuoi continuare comunque?" +diff -U3 -N -r a/po/ja.po b/po/ja.po +--- a/po/ja.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/ja.po 2021-07-16 11:11:54.663604756 +0200 +@@ -7,11 +7,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2018-09-20 03:07+0000\n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2020-06-26 04:26-0400\n" - "Last-Translator: Copied by Zanata \n" - "Language-Team: Korean\n" - "Language: ko\n" -@@ -14,96 +15,105 @@ - "Plural-Forms: nplurals=1; plural=0\n" - "X-Generator: Zanata 4.6.2\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" + "PO-Revision-Date: 2021-04-07 16:02+0000\n" + "Last-Translator: simmon \n" +-"Language-Team: Japanese \n" ++"Language-Team: Japanese \n" + "Language: ja\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" +@@ -19,225 +19,275 @@ + "Plural-Forms: nplurals=1; plural=0;\n" + "X-Generator: Weblate 4.5.3\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, fuzzy, python-brace-format ++#| msgid "The integrity check of the content failed. Cannot use the content." ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。" ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, 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}은/는 별도의 파티션이나 논리 볼륨이 있어야 하며 보안 프로파일이 설치되기 전에 파티션 레이아웃을 만들어야 합니다. " -+msgstr "{0}은/는 별도의 파티션이나 논리 볼륨이 있어야 하며 보안 프로파일이 설치되기 전에 파티션 레이아웃을 만들어야 합니다" + msgstr "" +-"{0} " +-"は、別のパーティションもしくは論理ボリューム上になければなりません。また、セキュリティープロファイルがインストールされる前にパーティションレイアウトに作成されなければなりません" ++"{0} は、別のパーティションもしくは論理ボリューム上になければなりません。ま" ++"た、セキュリティープロファイルがインストールされる前にパーティションレイアウ" ++"トに作成されなければなりません" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" --msgstr "마운트 지점 %(mount_point)s의 마운트 옵션 '%(mount_option)s'이/가 추가되었습니다. " -+msgstr "마운트 지점 %(mount_point)s의 마운트 옵션 '%(mount_option)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:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, python-format msgid "make sure to create password with minimal length of %d characters" --msgstr "최소 %d자 이상으로 암호를 만들어야 합니다 " -+msgstr "최소 %d자 이상으로 암호를 만들어야 합니다" + msgstr "%d 文字以上のパスワードを作成してください" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" - msgstr "root 암호 길이를 확인할 수 없습니다 (암호가 암호화됨)" + msgstr "root パスワードの長さを確認できません (パスワードは暗号化済み)" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " "required" --msgstr "root 암호가 너무 짧습니다. 최소 %d자 이어야 합니다." -+msgstr "root 암호가 너무 짧습니다. 최소 %d자 이어야 합니다" + msgstr "root のパスワードが短すぎます。%d 文字以上にする必要があります" --#: ../org_fedora_oscap/rule_handling.py:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, python-format msgid "package '%s' has been added to the list of to be installed packages" --msgstr "패키지 '%s'이/가 설치할 패키지 목록에 추가되었습니다. " -+msgstr "패키지 '%s'이/가 설치할 패키지 목록에 추가되었습니다" + msgstr "パッケージ '%s' が、インストール予定パッケージ一覧に追加されました" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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}'가 제외된 패키지 목록에 추가되었지만 설치를 중단하지 않고 현재 소프트웨어 선택에서 제거할 수 없습니다." -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, 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:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, python-format msgid "package '%s' has been added to the list of excluded packages" --msgstr "패키지 '%s'이/가 제외된 패키지 목록에 추가되었습니다. " -+msgstr "패키지 '%s'이/가 제외된 패키지 목록에 추가되었습니다" + msgstr "パッケージ '%s' が、除外パッケージ一覧に追加されました" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" --msgstr "시작시 Kdump가 비활성화됩니다. " -+msgstr "시작시 Kdump가 비활성화됩니다" + msgstr "Kdump は起動時に無効になります" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" --msgstr "시작시 Kdump가 활성화됩니다. " -+msgstr "시작시 Kdump가 활성화됩니다" + msgstr "Kdump は起動時に有効になります" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" --msgstr "시작시 방화벽이 비활성화됩니다. " -+msgstr "시작시 방화벽이 비활성화됩니다" + msgstr "ファイアウォールは起動時に無効になります" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" --msgstr "시작시 방화벽이 활성화됩니다. " -+msgstr "시작시 방화벽이 활성화됩니다" + msgstr "ファイアウォールは起動時に有効になります" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, python-format msgid "" "service '%s' has been added to the list of services to be added to the " "firewall" --msgstr "서비스 '%s'이/가 방화벽에 추가할 서비스 목록에 추가되었습니다. " -+msgstr "서비스 '%s'이/가 방화벽에 추가할 서비스 목록에 추가되었습니다" +-msgstr "サービス '%s' が、ファイアウォールに追加予定のサービス一覧に追加されました" ++msgstr "" ++"サービス '%s' が、ファイアウォールに追加予定のサービス一覧に追加されました" --#: ../org_fedora_oscap/rule_handling.py:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, python-format msgid "" "port '%s' has been added to the list of ports to be added to the firewall" --msgstr "포트 '%s'이/가 방화벽에 추가할 포트 목록에 추가되었습니다. " -+msgstr "포트 '%s'이/가 방화벽에 추가할 포트 목록에 추가되었습니다" + msgstr "ポート '%s' が、ファイアウォールに追加予定のポート一覧に追加されました" --#: ../org_fedora_oscap/rule_handling.py:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, python-format msgid "" "trust '%s' has been added to the list of trusts to be added to the firewall" --msgstr "트러스트 '%s'이/가 방화벽에 추가할 트러스트 목록에 추가되었습니다. " -+msgstr "트러스트 '%s'이/가 방화벽에 추가할 트러스트 목록에 추가되었습니다" +-msgstr "トラスト '%s' が、ファイアウォールに追加予定のトラスト一覧に追加されました" ++msgstr "" ++"トラスト '%s' が、ファイアウォールに追加予定のトラスト一覧に追加されました" --#: ../org_fedora_oscap/rule_handling.py:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " "firewall" --msgstr "서비스 '%s'이/가 방화벽에서 제거할 서비스 목록에 추가되었습니다. " -+msgstr "서비스 '%s'이/가 방화벽에서 제거할 서비스 목록에 추가되었습니다" +-msgstr "サービス '%s' が、ファイアウォールから削除予定のサービス一覧に追加されました" ++msgstr "" ++"サービス '%s' が、ファイアウォールから削除予定のサービス一覧に追加されました" - #: ../org_fedora_oscap/ks/oscap.py:418 - #, python-format -@@ -126,101 +136,101 @@ +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." + msgstr "" +-"セキュリティーコンテンツの取得時およびロード時にエラーが発生しました。\n" +-"%s\n" +-"インストールを停止する必要があります。それでも続行しますか?" + +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:377 ++msgid "Do you wish to continue anyway?" + msgstr "" +-"セキュリティーコンテンツの整合性チェックに失敗しました。\n" +-"インストールを停止する必要があります。それでも続行しますか?" ++ ++#: ../org_fedora_oscap/ks/oscap.py:400 ++#, 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 ++#, 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 ++msgid "There was an unexpected problem with the supplied content." ++msgstr "" ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "設定ミスが検出されました" #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "보안 정책(_S):" -+msgid "_Security Policy" -+msgstr "보안 정책(_S)" +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "セキュリティーポリシ" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" --msgstr "준비되어 있지 않습니다 " -+msgstr "준비되어 있지 않습니다" + msgstr "準備ができていません" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" --msgstr "컨텐츠 데이터를 가져오는 중 " -+msgstr "컨텐츠 데이터를 가져오는 중" + msgstr "コンテンツデータの取得中" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" --msgstr "프로파일이 선택되지 않았습니다 " -+msgstr "프로파일이 선택되지 않았습니다" + msgstr "選択されたプロファイルはありません" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" --msgstr "사전 설치 단계의 규칙이 없습니다 " -+msgstr "사전 설치 단계의 규칙이 없습니다" + msgstr "プレインストールフェーズのルールがありません" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." --msgstr "잘못된 내용이 입력되었습니다. 다른 URL을 입력하십시오. " -+msgstr "잘못된 내용이 입력되었습니다. 다른 URL을 입력하십시오." + msgstr "無効なコンテンツが入力されました。別の URL を入力してください。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 msgid "Invalid or unsupported content URL, please enter a different one." --msgstr "유효하지 않거나 지원되지 않는 컨텐츠 URL입니다. 다른 URL을 입력하십시오. " -+msgstr "유효하지 않거나 지원되지 않는 컨텐츠 URL입니다. 다른 URL을 입력하십시오." +-msgstr "コンテンツ URL が無効またはサポートされていません。別の URL を入力していません。" ++msgstr "" ++"コンテンツ URL が無効またはサポートされていません。別の URL を入力していませ" ++"ん。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." --msgstr "컨텐츠를 가져오지 못했습니다. 다른 URL을 입력하십시오. " -+msgstr "컨텐츠를 가져오지 못했습니다. 다른 URL을 입력하십시오." + msgstr "コンテンツの取得に失敗しました。別の URL を入力してください。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." --msgstr "컨텐츠를 가져오는 중 네트워크 오류가 발생했습니다. 네트워크가 제대로 작동하는지 확인하십시오. " -+msgstr "컨텐츠를 가져오는 중 네트워크 오류가 발생했습니다. 네트워크가 제대로 작동하는지 확인하십시오." +-msgstr "データの取得時にネットワークエラーが発生しました。ネットワークが設定されており、動作していることを確認してください。" ++msgstr "" ++"データの取得時にネットワークエラーが発生しました。ネットワークが設定されてお" ++"り、動作していることを確認してください。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 msgid "The integrity check of the content failed. Cannot use the content." --msgstr "컨텐츠 무결성 검사에 실패했습니다. 컨텐츠를 사용할 수 없습니다. " -+msgstr "컨텐츠 무결성 검사에 실패했습니다. 컨텐츠를 사용할 수 없습니다." + msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, python-format msgid "Failed to extract content (%s). Enter a different URL, please." --msgstr "컨텐츠 (%s)을/를 가져오지 못했습니다. 다른 URL을 입력하십시오. " -+msgstr "컨텐츠 (%s)을/를 가져오지 못했습니다. 다른 URL을 입력하십시오." + msgstr "コンテンツ (%s) の抽出に失敗しました。別の URL を入力してください。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" --msgstr "ID '%s'이/가 프로파일에 정의되어 있지 않습니다. 다른 프로파일을 선택하십시오. " -+msgstr "ID '%s'이/가 프로파일에 정의되어 있지 않습니다. 다른 프로파일을 선택하십시오" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" +-msgstr "コンテンツで ID が '%s' のプロファイルが定義されていません。別のプロファイルを選択してください" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" ++msgstr "" ++"コンテンツで ID が '%s' のプロファイルが定義されていません。別のプロファイル" ++"を選択してください" --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" --msgstr "보안 정책을 적용하지 않음 " -+msgstr "보안 정책을 적용하지 않음" + msgstr "セキュリティーポリシーを適用しない" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" --msgstr "데이터 스트림 컨텐츠를 입력하거나 다음 URL을 아카이브하십시오." -+msgstr "데이터 스트림 컨텐츠를 입력하거나 다음 URL을 아카이브하십시오:" +-msgstr " または、以下にデータストリームコンテンツもしくはアーカイブの URL を入力します:" ++msgstr "" ++" または、以下にデータストリームコンテンツもしくはアーカイブの URL を入力しま" ++"す:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 msgid "" "No content found. Please enter data stream content or archive URL below:" --msgstr "내용이 없습니다. 데이터 스트림 컨텐츠를 입력하거나 또는 다음 URL을 아카이브하십시오." -+msgstr "내용이 없습니다. 데이터 스트림 컨텐츠를 입력하거나 또는 다음 URL을 아카이브하십시오:" +-msgstr "コンテンツが見つかりませんでした。以下にデータストリームコンテンツもしくはアーカイブの URL を入力してください:" ++msgstr "" ++"コンテンツが見つかりませんでした。以下にデータストリームコンテンツもしくは" ++"アーカイブの URL を入力してください:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" --msgstr "컨텐츠 오류 가져오기 및 로딩 오류 " -+msgstr "컨텐츠 오류 가져오기 및 로딩 오류" + msgstr "コンテンツの取得およびロードのエラー" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" --msgstr "컨텐츠를 찾을 수 없음 " -+msgstr "컨텐츠를 찾을 수 없음" + msgstr "コンテンツが見つかりませんでした" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" --msgstr "설정 오류가 감지되었습니다 " -+msgstr "설정 오류가 감지되었습니다" + msgstr "設定ミスが検出されました" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" --msgstr "경고가 표시되었습니다 " -+msgstr "경고가 표시되었습니다" + msgstr "警告が表示されました" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" - msgstr "모든 것이 정상입니다" + msgstr "すべて OK" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" - msgstr "유효하지 않거나 지원되지 않는 URL" + msgstr "無効またはサポートされていない URL" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." - msgstr "컨텐츠 가져오는 중..." - -@@ -246,7 +256,7 @@ - - #: tmp/oscap.glade.h:6 - msgid "Choose profile below:" --msgstr "프로파일 선택: " -+msgstr "프로파일 선택:" - - # auto translated by TM merge from project: RHOSP Director Installation and - # Usage , version: 11-Korean, DocId: master -@@ -256,7 +266,7 @@ - - #: tmp/oscap.glade.h:8 - msgid "Selected" --msgstr "선택됨 " -+msgstr "선택됨" - - #: tmp/oscap.glade.h:9 - msgid "_Select profile" -@@ -270,11 +280,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "SCAP 보안 가이드 사용(_U)" + msgstr "コンテンツの取得中..." --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -288,3 +338,19 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" - msgstr "가져오기(_F)" -diff -U3 -N -r a/po/oscap-anaconda-addon.pot b/po/oscap-anaconda-addon.pot ---- a/po/oscap-anaconda-addon.pot 2020-06-02 14:15:10.000000000 +0200 -+++ b/po/oscap-anaconda-addon.pot 2021-02-15 11:32:20.366504523 +0100 -@@ -8,7 +8,7 @@ + msgstr "取得(_F)" ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "セキュリティーコンテンツの取得時およびロード時にエラーが発生しました。\n" ++#~ "%s\n" ++#~ "インストールを停止する必要があります。それでも続行しますか?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "セキュリティーコンテンツの整合性チェックに失敗しました。\n" ++#~ "インストールを停止する必要があります。それでも続行しますか?" +diff -U3 -N -r a/po/ko.po b/po/ko.po +--- a/po/ko.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/ko.po 2021-07-16 11:11:54.663604756 +0200 +@@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-02 14:00+0200\n" -+"POT-Creation-Date: 2020-07-09 17:31+0200\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" -@@ -17,7 +17,7 @@ - "Content-Type: text/plain; charset=CHARSET\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" +-"PO-Revision-Date: 2021-04-02 07:02+0000\n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" ++"PO-Revision-Date: 2021-07-06 15:04+0000\n" + "Last-Translator: simmon \n" + "Language-Team: Korean \n" +@@ -15,224 +15,260 @@ + "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.7.1\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -26,82 +26,90 @@ - msgstr "" +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "zipfile로 압축 해제 중 오류가 발생하였습니다: {exc}" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, python-brace-format ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "내용 무결성 검사에 실패 - {hash_obj.name} 해쉬가 일치하지 않습니다" ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 + #, 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}은 별도의 파티션이나 논리 볼륨이 있어야 하며 보안 프로파일이 설치되기 전에 파티션 레이아웃을 만들어야 합니다" ++msgstr "" ++"{0}은 별도의 파티션이나 논리 볼륨이 있어야 하며 보안 프로파일이 설치되기 전" ++"에 파티션 레이아웃을 만들어야 합니다" + + #. template for the message +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 + #, python-format + msgid "" + "mount option '%(mount_option)s' added for the mount point %(mount_point)s" +-msgstr "적재 지점 %(mount_point)s의 적재 옵션 '%(mount_option)s'가 추가되었습니다" ++msgstr "" ++"적재 지점 %(mount_point)s의 적재 옵션 '%(mount_option)s'가 추가되었습니다" + + #. root password was not set +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 + #, python-format + msgid "make sure to create password with minimal length of %d characters" + msgstr "최소 %d자 이상으로 비밀번호를 만들어야 합니다" + +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 + msgid "cannot check root password length (password is crypted)" + msgstr "root 비밀번호 길이를 확인 할 수 없습니다 (비밀번호가 암호화됩니다)" + + #. too short +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 + #, 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:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 + #, 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:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, 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:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 + #, python-format + msgid "package '%s' has been added to the list of excluded packages" + msgstr "꾸러미(package) '%s'가 제외된 꾸러미(package) 목록에 추가되었습니다" + +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 + msgid "Kdump will be disabled on startup" + msgstr "시작시 Kdump가 비활성화됩니다" + +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 + msgid "Kdump will be enabled on startup" + msgstr "시작시 Kdump가 활성화됩니다" + +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 + msgid "Firewall will be disabled on startup" + msgstr "시작시 방화벽이 비활성화됩니다" + +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 + msgid "Firewall will be enabled on startup" + msgstr "시작시 방화벽이 활성화됩니다" + +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 + #, 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:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 + #, 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:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 + #, 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:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 + #, 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:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +-"보안 내용 가져오기 및 적재 중 오류가 발생했습니다.:\n" +-"%s\n" +-"설치를 중단해야 합니다. 계속 진행하겠습니까?" +- +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +-"보안 내용에 대한 무결성 검사에 실패했습니다.\n" +-"설치를 중단해야 합니다. 계속 진행하겠습니까?" ++#: ../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 ++msgid "The integrity check of the security content failed." ++msgstr "보안 내용의 무결성 검사가 실패했습니다." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++msgid "There was an error fetching and loading the security content:\n" ++msgstr "가져오기와 보안 내용 적재 중에 오류가 발생하였습니다:\n" ++ ++#: ../org_fedora_oscap/ks/oscap.py:409 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:774 ++msgid "There was an unexpected problem with the supplied content." ++msgstr "제시된 내용에 예상치 못한 문제가 있습니다." ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++msgid "Wrong configuration detected!" ++msgstr "잘못된 구성이 감지되었습니다!" + + #. title of the spoke (will be displayed on the hub) +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "_보안 정책" + + #. the first status provided +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 + msgid "Not ready" + msgstr "준비되지 않음" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 + msgid "Fetching content data" + msgstr "내용 자료를 가져오는 중" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 + msgid "No profile selected" + msgstr "프로파일이 선택되지 않았습니다" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 + msgid "No rules for the pre-installation phase" + msgstr "사전 설치 단계의 규칙이 없습니다" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 + msgid "Invalid content provided. Enter a different URL, please." + msgstr "잘못된 내용이 입력되었습니다. 다른 URL을 입력하십시오." + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 + msgid "Invalid or unsupported content URL, please enter a different one." + msgstr "유효하지 않거나 지원되지 않는 내용 URL입니다. 다른 URL을 입력하십시오." + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 + msgid "Failed to fetch content. Enter a different URL, please." + msgstr "내용을 가져오지 못했습니다. 다른 URL을 입력하세요." + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 + msgid "" + "Network error encountered when fetching data. Please check that network is " + "setup and working." +-msgstr "내용을 가져오는 중 네트워크 오류가 발생했습니다. 네트워크가 제대로 작동하는지 확인하십시오." ++msgstr "" ++"내용을 가져오는 중 네트워크 오류가 발생했습니다. 네트워크가 제대로 작동하는" ++"지 확인하십시오." + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 + msgid "The integrity check of the content failed. Cannot use the content." + msgstr "내용 무결성 검사에 실패했습니다. 내용을 사용 할 수 없습니다." + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 + #, python-format + msgid "Failed to extract content (%s). Enter a different URL, please." + msgstr "내용 (%s)를 가져오지 못했습니다. 다른 URL을 입력하십시오." + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 + #, python-format + msgid "" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" +-msgstr "ID '%s'가 프로파일에 정의되어 있지 않습니다. 다른 프로파일을 선택하세요" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" ++msgstr "" ++"ID '%s'가 프로파일에 정의되어 있지 않습니다. 다른 프로파일을 선택하세요" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 + msgid "Not applying security policy" + msgstr "보안 정책을 적용하지 않음" + + #. TRANSLATORS: the other choice if SCAP Security Guide is also + #. available +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 + msgid " or enter data stream content or archive URL below:" + msgstr " 자료 스트림 내용을 입력하거나 아래 URL 저장소:" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 + msgid "Error fetching and loading content" + msgstr "내용 가져오기와 적재 오류" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 + msgid "No content found" + msgstr "내용을 찾을 수 없음" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 + msgid "Misconfiguration detected" + msgstr "설정 오류가 감지되었습니다" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 + msgid "Warnings appeared" + msgstr "경고가 표시되었습니다" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 + msgid "Everything okay" + msgstr "모든 것이 정상입니다" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 + msgid "Invalid or unsupported URL" + msgstr "유효하지 않거나 지원되지 않는 URL" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 + msgid "Fetching content..." + msgstr "컨텐츠 가져오는 중..." + +@@ -285,3 +321,19 @@ + #: tmp/oscap.glade.h:13 + msgid "_Fetch" + msgstr "가져오기(_F)" ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "보안 내용 가져오기 및 적재 중 오류가 발생했습니다.:\n" ++#~ "%s\n" ++#~ "설치를 중단해야 합니다. 계속 진행하겠습니까?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "보안 내용에 대한 무결성 검사에 실패했습니다.\n" ++#~ "설치를 중단해야 합니다. 계속 진행하겠습니까?" +diff -U3 -N -r a/po/lt.po b/po/lt.po +--- a/po/lt.po 2020-08-27 17:04:44.000000000 +0200 ++++ b/po/lt.po 1970-01-01 01:00:00.000000000 +0100 +@@ -1,276 +0,0 @@ +-# Watson Yuuma Sato , 2017. #zanata +-msgid "" +-msgstr "" +-"Project-Id-Version: PACKAGE VERSION\n" +-"Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" +-"PO-Revision-Date: 2017-11-23 10:16-0500\n" +-"Last-Translator: Copied by Zanata \n" +-"Language-Team: Lithuanian\n" +-"Language: lt\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%100<10 || n%100>=20) ? 1 : 2)\n" +-"X-Generator: Zanata 4.6.2\n" +- +-#: ../org_fedora_oscap/rule_handling.py:409 +-#, 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 "" +- +-#. template for the message +-#: ../org_fedora_oscap/rule_handling.py:420 +-#, 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:529 +-#, python-format +-msgid "make sure to create password with minimal length of %d characters" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:536 +-msgid "cannot check root password length (password is crypted)" +-msgstr "" +- +-#. too short +-#: ../org_fedora_oscap/rule_handling.py:542 +-#, 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:660 +-#: ../org_fedora_oscap/rule_handling.py:675 +-#, python-format +-msgid "package '%s' has been added to the list of to be installed packages" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:685 +-#, 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 "" +- +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 +-#, python-format +-msgid "package '%s' has been added to the list of excluded packages" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:808 +-msgid "Kdump will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:810 +-msgid "Kdump will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:963 +-msgid "Firewall will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:970 +-msgid "Firewall will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 +-#, 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:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 +-#, 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:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 +-#, 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:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 +-#, 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:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +- +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +- +-#. title of the spoke (will be displayed on the hub) +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +-msgid "_Security Policy" +-msgstr "" +- +-#. the first status provided +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-msgid "Not ready" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-msgid "Fetching content data" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-msgid "No profile selected" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-msgid "No rules for the pre-installation phase" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-msgid "Invalid content provided. Enter a different URL, please." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-msgid "Invalid or unsupported content URL, please enter a different one." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-msgid "Failed to fetch content. Enter a different URL, please." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-msgid "" +-"Network error encountered when fetching data. Please check that network is " +-"setup and working." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-msgid "The integrity check of the content failed. Cannot use the content." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#, python-format +-msgid "Failed to extract content (%s). Enter a different URL, please." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#, 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:873 +-msgid "Not applying security policy" +-msgstr "" +- +-#. TRANSLATORS: the other choice if SCAP Security Guide is also +-#. available +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-msgid " or enter data stream content or archive URL below:" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 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:1046 +-msgid "Error fetching and loading content" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-msgid "No content found" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-msgid "Misconfiguration detected" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-msgid "Warnings appeared" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-msgid "Everything okay" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-msgid "Invalid or unsupported URL" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-msgid "Fetching content..." +-msgstr "" +- +-#: tmp/oscap.glade.h:1 +-msgid "SECURITY POLICY" +-msgstr "" +- +-#: tmp/oscap.glade.h:2 +-msgid "_Change content" +-msgstr "" +- +-#: tmp/oscap.glade.h:3 +-msgid "Apply security policy:" +-msgstr "" +- +-#: tmp/oscap.glade.h:4 +-msgid "Data stream:" +-msgstr "" +- +-#: tmp/oscap.glade.h:5 +-msgid "Checklist:" +-msgstr "" +- +-#: tmp/oscap.glade.h:6 +-msgid "Choose profile below:" +-msgstr "" +- +-#: tmp/oscap.glade.h:7 +-msgid "Profile" +-msgstr "" +- +-#: tmp/oscap.glade.h:8 +-msgid "Selected" +-msgstr "" +- +-#: tmp/oscap.glade.h:9 +-msgid "_Select profile" +-msgstr "" +- +-#: tmp/oscap.glade.h:10 +-msgid "Changes that were done or need to be done:" +-msgstr "" +- +-#: tmp/oscap.glade.h:11 +-msgid "_Use SCAP Security Guide" +-msgstr "" +- +-#: tmp/oscap.glade.h:13 +-msgid "_Fetch" +-msgstr "" +diff -U3 -N -r a/po/oscap-anaconda-addon.pot b/po/oscap-anaconda-addon.pot +--- a/po/oscap-anaconda-addon.pot 2021-06-21 11:57:46.000000000 +0200 ++++ b/po/oscap-anaconda-addon.pot 2021-07-16 11:11:54.672604904 +0200 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2021-06-21 11:45+0200\n" ++"POT-Creation-Date: 2020-07-09 17:31+0200\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME \n" + "Language-Team: LANGUAGE \n" +@@ -17,28 +17,7 @@ + "Content-Type: text/plain; charset=CHARSET\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: ../org_fedora_oscap/common.py:326 +-#, python-brace-format +-msgid "Error extracting archive as a zipfile: {exc}" +-msgstr "" +- +-#: ../org_fedora_oscap/content_discovery.py:167 +-#, python-brace-format +-msgid "" +-"Integrity check of the content failed - {hash_obj.name} hash didn't match" +-msgstr "" +- +-#: ../org_fedora_oscap/data_fetch.py:117 +-msgid "Network connection needed to fetch data." +-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 "" +- +-#: ../org_fedora_oscap/rule_handling.py:434 ++#: ../org_fedora_oscap/rule_handling.py:409 + #, python-brace-format + msgid "" + "{0} must be on a separate partition or logical volume and has to be created " +@@ -47,37 +26,37 @@ + msgstr "" + + #. template for the message +-#: ../org_fedora_oscap/rule_handling.py:445 ++#: ../org_fedora_oscap/rule_handling.py:420 + #, 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:529 + #, 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:536 + 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:542 + #, 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:660 ++#: ../org_fedora_oscap/rule_handling.py:675 + #, 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:685 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -85,180 +64,169 @@ + "installation." + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:717 +-#: ../org_fedora_oscap/rule_handling.py:732 ++#: ../org_fedora_oscap/rule_handling.py:692 ++#: ../org_fedora_oscap/rule_handling.py:707 + #, 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:808 + msgid "Kdump will be disabled on startup" + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:835 ++#: ../org_fedora_oscap/rule_handling.py:810 + msgid "Kdump will be enabled on startup" + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:988 ++#: ../org_fedora_oscap/rule_handling.py:963 + msgid "Firewall will be disabled on startup" + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:995 ++#: ../org_fedora_oscap/rule_handling.py:970 + 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:978 ++#: ../org_fedora_oscap/rule_handling.py:1017 + #, 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:985 ++#: ../org_fedora_oscap/rule_handling.py:1030 + #, 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:992 ++#: ../org_fedora_oscap/rule_handling.py:1043 + #, 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:1055 ++#: ../org_fedora_oscap/rule_handling.py:1070 + #, 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 +-msgid "The integrity check of the security content failed." +-msgstr "" +- +-#: ../org_fedora_oscap/ks/oscap.py:404 +-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 +-msgid "There was an unexpected problem with the supplied content." ++#: ../org_fedora_oscap/ks/oscap.py:418 ++#, python-format ++msgid "" ++"There was an error fetching and loading the security content:\n" ++"%s\n" ++"The installation should be aborted. Do you wish to continue anyway?" + msgstr "" + +-#: ../org_fedora_oscap/ks/oscap.py:462 +-msgid "Wrong configuration detected!" ++#: ../org_fedora_oscap/ks/oscap.py:447 ++msgid "" ++"The integrity check of the security content failed.\n" ++"The installation should be aborted. Do you wish to continue anyway?" + msgstr "" + + #. title of the spoke (will be displayed on the hub) +-#: ../org_fedora_oscap/gui/spokes/oscap.py:201 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:198 + msgid "_Security Policy" + msgstr "" + + #. the first status provided +-#: ../org_fedora_oscap/gui/spokes/oscap.py:229 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:226 + msgid "Not ready" + msgstr "" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:383 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:374 + 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:641 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 + msgid "No profile selected" + msgstr "" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:631 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:646 + msgid "No rules for the pre-installation phase" + msgstr "" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:782 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 + 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:806 + 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:814 + 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:822 + 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:831 + 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:839 + #, 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:857 + #, 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 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:873 + msgid "Not applying security policy" + 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:904 + 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:908 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:1046 + msgid "Error fetching and loading content" + msgstr "" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 + msgid "No content found" + msgstr "" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 + msgid "Misconfiguration detected" + msgstr "" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 + msgid "Warnings appeared" + msgstr "" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 + msgid "Everything okay" + msgstr "" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 + 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:1154 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-06-21 11:59:10.000000000 +0200 ++++ b/po/pl.po 2021-07-16 11:11:54.663604756 +0200 +@@ -10,23 +10,23 @@ + # Jacek Smyda , 1998 + # Leszek Matok , 2004 + # Pawel Szopinski , 2004 +-# Piotr Drąg , 2014, 2020. ++# Piotr Drąg , 2014, 2020, 2021. + # Radosław Zawartko , 2004 + # sonyam , 2004 + # Stanisław Małolepszy , 2006 + # Tom Berner , 2005 + # Tom Berner , 2004 + # Wojciech Kapusta , 2006 +-# Piotr Drąg , 2015. #zanata, 2020. +-# Piotr Drąg , 2017. #zanata, 2020. +-# Piotr Drąg , 2018. #zanata, 2020. +-# Piotr Drąg , 2020. #zanata ++# Piotr Drąg , 2015. #zanata, 2020, 2021. ++# Piotr Drąg , 2017. #zanata, 2020, 2021. ++# Piotr Drąg , 2018. #zanata, 2020, 2021. ++# Piotr Drąg , 2020. #zanata, 2021. + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" +-"PO-Revision-Date: 2020-09-07 11:29+0000\n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" ++"PO-Revision-Date: 2021-06-24 14:51+0000\n" + "Last-Translator: Piotr Drąg \n" + "Language-Team: Polish \n" +@@ -36,9 +36,34 @@ + "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.7\n" + +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "Błąd podczas rozpakowywania archiwum jako pliku ZIP: {exc}" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, 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 — suma {hash_obj.name} się " ++"nie zgadza" ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 + #, python-brace-format + msgid "" + "{0} must be on a separate partition or logical volume and has to be created " +@@ -50,7 +75,7 @@ + "za pomocą profilu bezpieczeństwa" + + #. template for the message +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 + #, python-format + msgid "" + "mount option '%(mount_option)s' added for the mount point %(mount_point)s" +@@ -59,17 +84,17 @@ + "%(mount_point)s" + + #. root password was not set +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 + #, 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:536 ++#: ../org_fedora_oscap/rule_handling.py:561 + 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:542 ++#: ../org_fedora_oscap/rule_handling.py:567 + #, python-format + msgid "" + "root password is too short, a longer one with at least %d characters is " +@@ -77,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:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 + #, 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:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -94,114 +119,119 @@ + "może zostać usunięty z obecnego wyboru oprogramowania bez uszkodzenia " + "instalacji." + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 + #, 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:808 ++#: ../org_fedora_oscap/rule_handling.py:833 + msgid "Kdump will be disabled on startup" + msgstr "Kdump będzie wyłączone podczas uruchamiania" + +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 + msgid "Kdump will be enabled on startup" + msgstr "Kdump będzie włączone podczas uruchamiania" + +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 + msgid "Firewall will be disabled on startup" + msgstr "Zapora sieciowa będzie wyłączona podczas uruchamiania" + +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 + msgid "Firewall will be enabled on startup" + msgstr "Zapora sieciowa będzie włączona podczas uruchamiania" + +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 + #, 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:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 + #, 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:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 + #, 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:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 + #, 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:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +-"Wystąpił błąd podczas pobierania i wczytywania treści bezpieczeństwa:\n" +-"%s\n" +-"Instalacja powinna zostać przerwana. Kontynuować mimo to?" +- +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +-"Sprawdzenie spójności treści bezpieczeństwa się nie powiodło.\n" +-"Instalacja powinna zostać przerwana. Kontynuować mimo to?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." ++msgstr "Instalacja powinna zostać przerwana." ++ ++#: ../org_fedora_oscap/ks/oscap.py:377 ++msgid "Do you wish to continue anyway?" ++msgstr "Kontynuować mimo to?" ++ ++#: ../org_fedora_oscap/ks/oscap.py:400 ++msgid "The integrity check of the security content failed." ++msgstr "Sprawdzenie integralności treści bezpieczeństwa się nie powiodło." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++msgid "There was an error fetching and loading the security content:\n" ++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 ++msgid "There was an unexpected problem with the supplied content." ++msgstr "Wystąpił nieoczekiwany problem z dostarczoną treścią." ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++msgid "Wrong configuration detected!" ++msgstr "Wykryto błędną konfigurację." + + #. title of the spoke (will be displayed on the hub) +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "_Zasady bezpieczeństwa" + + #. the first status provided +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 + msgid "Not ready" + msgstr "Niegotowe" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 + msgid "Fetching content data" + msgstr "Pobieranie danych treści" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 + msgid "No profile selected" + msgstr "Nie wybrano profilu" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 + msgid "No rules for the pre-installation phase" + msgstr "Brak reguł dla fazy przedinstalacyjnej" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 + 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:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 + msgid "Invalid or unsupported content URL, please enter a different one." +-msgstr "" +-"Nieprawidłowy lub nieobsługiwany adres URL treści, proszę wybrać inny." ++msgstr "Nieprawidłowy lub nieobsługiwany adres URL treści, proszę wybrać inny." + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 + 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:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 + msgid "" + "Network error encountered when fetching data. Please check that network is " + "setup and working." +@@ -209,68 +239,68 @@ + "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:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 + 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:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 + #, 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:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 + #, python-format + msgid "" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" + msgstr "" + "W treści nie określono profilu o identyfikatorze „%s”. Proszę wybrać inny " + "profil" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 + msgid "Not applying security policy" + msgstr "Bez zastosowywania zasad bezpieczeństwa" + + #. TRANSLATORS: the other choice if SCAP Security Guide is also + #. available +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 + 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:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 + msgid "Error fetching and loading content" + msgstr "Błąd podczas pobierania i wczytywania treści" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 + msgid "No content found" + msgstr "Nie odnaleziono treści" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 + msgid "Misconfiguration detected" + msgstr "Wykryto błędną konfigurację" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 + msgid "Warnings appeared" + msgstr "Pojawiły się ostrzeżenia" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 + msgid "Everything okay" + msgstr "Wszystko jest w porządku" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 + msgid "Invalid or unsupported URL" + msgstr "Nieprawidłowy lub nieobsługiwany adres URL" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 + msgid "Fetching content..." + msgstr "Pobieranie treści…" + +@@ -321,3 +351,19 @@ + #: tmp/oscap.glade.h:13 + msgid "_Fetch" + msgstr "_Pobierz" ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Wystąpił błąd podczas pobierania i wczytywania treści bezpieczeństwa:\n" ++#~ "%s\n" ++#~ "Instalacja powinna zostać przerwana. Kontynuować mimo to?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Sprawdzenie spójności treści bezpieczeństwa się nie powiodło.\n" ++#~ "Instalacja powinna zostać przerwana. Kontynuować mimo to?" +diff -U3 -N -r a/po/pt_BR.po b/po/pt_BR.po +--- a/po/pt_BR.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/pt_BR.po 2021-07-16 11:11:54.663604756 +0200 +@@ -11,7 +11,7 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"POT-Creation-Date: 2021-06-21 11:51+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/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, fuzzy, python-brace-format ++#| msgid "The integrity check of the content failed. Cannot use the content." ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "" ++"A verificação de integridade do conteúdo falhou. Não é possível usar o " ++"conteúdo." ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 + #, python-brace-format + msgid "" + "{0} must be on a separate partition or logical volume and has to be created " +@@ -31,11 +55,11 @@ + "profile" + msgstr "" + "{0} deve estar em uma partição separada ou em um volume lógico e deve ser " +-"criado no layout de particionamento antes que a instalação possa ocorrer com" +-" um perfil de segurança" ++"criado no layout de particionamento antes que a instalação possa ocorrer com " ++"um perfil de segurança" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" - msgstr "" +@@ -44,20 +68,19 @@ + "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, 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:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" msgstr "" +-"Não é possível verificar o comprimento da senha do root (senha " +-"criptografada)" ++"Não é possível verificar o comprimento da senha do root (senha criptografada)" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " - "required" - msgstr "" +@@ -66,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:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, python-format msgid "package '%s' has been added to the list of to be installed packages" - msgstr "" + msgstr "pacote '%s' foi adicionado à lista de pacotes a serem instalados" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -82,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:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, python-format msgid "package '%s' has been added to the list of excluded packages" - msgstr "" + msgstr "pacote '%s' foi adicionado a lista de pacotes a serem excluídos" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" - msgstr "" + msgstr "O Kdump será desativado na inicialização" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" - msgstr "" + msgstr "O Kdump será ativado na inicialização" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" - msgstr "" + msgstr "Firewall será desativado na inicialização" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" - msgstr "" + msgstr "Firewall será ativado na inicialização" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, python-format msgid "" "service '%s' has been added to the list of services to be added to the " +@@ -114,16 +137,16 @@ + "serviço '%s'foi adicionado à lista de serviços a serem adicionados ao " "firewall" - msgstr "" --#: ../org_fedora_oscap/rule_handling.py:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, 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:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, python-format msgid "" "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "" +@@ -131,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:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -128,97 +136,97 @@ +@@ -140,62 +163,76 @@ + msgstr "" + "serviço '%s'foi adicionado à lista de serviços a serem removidos do firewall" + +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." + msgstr "" +-"Ocorreu um erro ao buscar e carregar o conteúdo de segurança:\n" +-"%s\n" +-"A instalação deve ser interrompida. Deseja continuar assim mesmo?" + +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../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." ++msgid "The integrity check of the security content failed." ++msgstr "" ++"A verificação de integridade do conteúdo falhou. Não é possível usar o " ++"conteúdo." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++#, 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 ++msgid "There was an unexpected problem with the supplied content." msgstr "" +-"A verificação de integridade do conteúdo de segurança falhou.\n" +-"A instalação deve ser interrompida. Deseja continuar assim mesmo?" ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "Misconfiguration detectado" + + #. title of the spoke (will be displayed on the hub) +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "Política de _segurança" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:223 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" - msgstr "" + msgstr "Ainda não esta pronto" --#: ../org_fedora_oscap/gui/spokes/oscap.py:371 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" - msgstr "" + msgstr "Buscando dados de conteúdo" --#: ../org_fedora_oscap/gui/spokes/oscap.py:638 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" - msgstr "" + msgstr "Nenhum perfil selecionado" --#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" - msgstr "" + msgstr "Não há regras para a fase de pré-instalação" --#: ../org_fedora_oscap/gui/spokes/oscap.py:795 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." - msgstr "" + msgstr "Conteúdo fornecido é inválido. Digite uma URL diferente, por favor." --#: ../org_fedora_oscap/gui/spokes/oscap.py:803 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 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:811 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." - msgstr "" + msgstr "Falha ao buscar conteúdo. Digite uma URL diferente, por favor." --#: ../org_fedora_oscap/gui/spokes/oscap.py:819 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." - msgstr "" +@@ -203,69 +240,68 @@ + "Foi encontrado um erro na rede ao buscar dados. Verifique se a rede está " + "configurada e funcionando." --#: ../org_fedora_oscap/gui/spokes/oscap.py:828 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 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:836 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, python-format msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "" +-msgstr "" +-"Falha ao extrair o conteúdo (%s). Digite uma URL diferente, por favor." ++msgstr "Falha ao extrair o conteúdo (%s). Digite uma URL diferente, por favor." --#: ../org_fedora_oscap/gui/spokes/oscap.py:854 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile, " - "please" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" msgstr "" + "Perfil com ID '%s' não definido no conteúdo. Selecione um perfil diferente, " + "por favor" --#: ../org_fedora_oscap/gui/spokes/oscap.py:870 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" - msgstr "" + 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:901 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" - msgstr "" + msgstr " ou inserir conteúdo de fluxo de dados ou arquivo de URL abaixo:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:905 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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:1043 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" - msgstr "" + msgstr "Erro ao buscar e carregar o conteúdo" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" - msgstr "" + msgstr "Nenhum conteúdo encontrado" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1061 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" - msgstr "" + msgstr "Misconfiguration detectado" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" - msgstr "" + msgstr "Advertências surgidas" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" - msgstr "" + msgstr "Tudo bem" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1145 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" - msgstr "" + msgstr "URL inválida ou não suportada" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1151 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." - msgstr "" - -@@ -266,11 +274,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "" + msgstr "Buscando conteúdo..." --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -316,3 +352,19 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" - msgstr "" -Binary files a/po/pl.mo and b/po/pl.mo differ -diff -U3 -N -r a/po/pl.po b/po/pl.po ---- a/po/pl.po 2020-06-02 14:21:36.000000000 +0200 -+++ b/po/pl.po 2021-02-15 11:32:20.362504514 +0100 -@@ -10,32 +10,35 @@ - # Jacek Smyda , 1998 - # Leszek Matok , 2004 - # Pawel Szopinski , 2004 --# Piotr Drąg , 2014 -+# Piotr Drąg , 2014, 2020. - # Radosław Zawartko , 2004 - # sonyam , 2004 - # Stanisław Małolepszy , 2006 - # Tom Berner , 2005 - # Tom Berner , 2004 - # Wojciech Kapusta , 2006 --# Piotr Drąg , 2015. #zanata --# Piotr Drąg , 2016. #zanata --# Piotr Drąg , 2018. #zanata -+# Piotr Drąg , 2015. #zanata, 2020. -+# Piotr Drąg , 2017. #zanata, 2020. -+# Piotr Drąg , 2018. #zanata, 2020. -+# Piotr Drąg , 2020. #zanata - msgid "" + msgstr "_Buscar" ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Ocorreu um erro ao buscar e carregar o conteúdo de segurança:\n" ++#~ "%s\n" ++#~ "A instalação deve ser interrompida. Deseja continuar assim mesmo?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "A verificação de integridade do conteúdo de segurança falhou.\n" ++#~ "A instalação deve ser interrompida. Deseja continuar assim mesmo?" +diff -U3 -N -r a/po/pt.po b/po/pt.po +--- a/po/pt.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/pt.po 2021-07-16 11:11:54.663604756 +0200 +@@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2018-07-03 02:59+0000\n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2020-09-07 11:29+0000\n" - "Last-Translator: Piotr Drąg \n" --"Language-Team: Polish (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/pl/)\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: Zanata 4.6.2\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" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" + "PO-Revision-Date: 2015-09-12 01:40-0400\n" + "Last-Translator: Manuela Silva \n" + "Language-Team: Portuguese\n" +@@ -14,7 +14,28 @@ + "Plural-Forms: nplurals=2; plural=(n != 1)\n" + "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, python-brace-format ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "" ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -47,7 +50,7 @@ - "za pomocą profilu bezpieczeństwa" +@@ -23,37 +44,37 @@ + msgstr "" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -56,17 +59,17 @@ - "%(mount_point)s" + msgstr "" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, 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" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" - msgstr "nie można sprawdzić długości hasła roota (hasło jest zaszyfrowane)" + msgstr "" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " -@@ -74,63 +77,74 @@ + "required" msgstr "" - "hasło roota jest za krótkie, wymagane jest dłuższe z co najmniej %d znakami" --#: ../org_fedora_oscap/rule_handling.py:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, 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" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+"pakiet „{package}” został dodany do listy wykluczonych pakietów, ale nie " -+"może zostać usunięty z obecnego wyboru oprogramowania bez uszkodzenia " -+"instalacji." -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -61,169 +82,184 @@ + "installation." + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, python-format msgid "package '%s' has been added to the list of excluded packages" - msgstr "dodano pakiet „%s” do listy wykluczonych pakietów" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" - msgstr "Kdump będzie wyłączone podczas uruchamiania" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" - msgstr "Kdump będzie włączone podczas uruchamiania" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" - msgstr "Zapora sieciowa będzie wyłączona podczas uruchamiania" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" - msgstr "Zapora sieciowa będzie włączona podczas uruchamiania" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, 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" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, 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" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, 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" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, 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" -+msgstr "dodano usługę „%s” do listy usług do usunięcia z zapory sieciowej" + msgstr "" - #: ../org_fedora_oscap/ks/oscap.py:418 - #, python-format -@@ -153,41 +167,41 @@ +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." + msgstr "" + +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:377 ++msgid "Do you wish to continue anyway?" ++msgstr "" ++ ++#: ../org_fedora_oscap/ks/oscap.py:400 ++msgid "The integrity check of the security content failed." ++msgstr "" ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++#, 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 ++msgid "There was an unexpected problem with the supplied content." + msgstr "" ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "Detetada má configuração" ++ #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "_POLITYKA BEZPIECZEŃSTWA" -+msgid "_Security Policy" -+msgstr "_Zasady bezpieczeństwa" +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" - msgstr "Niegotowe" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" - msgstr "Pobieranie danych treści" + msgstr "A obter dados de conteúdo" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" - msgstr "Nie wybrano profilu" + msgstr "Nenhum perfil selecionado" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" - msgstr "Brak reguł dla fazy przedinstalacyjnej" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." - msgstr "Podano nieprawidłową treść. Proszę podać inny adres URL." + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 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:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Pobranie treści się nie powiodło. Proszę podać inny adres URL." + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." -@@ -195,17 +209,17 @@ - "Wystąpił błąd sieci podczas pobierania danych. Proszę sprawdzić, czy sieć " - "została ustawiona i działa poprawnie." + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 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:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, 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." + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," -@@ -214,55 +228,55 @@ - "W treści nie określono profilu o identyfikatorze „%s”. Proszę wybrać inny " - "profil" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" --msgstr "Bez zastosowywania polityki bezpieczeństwa" -+msgstr "Bez zastosowywania zasad bezpieczeństwa" + msgstr "" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 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:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" - msgstr "Błąd podczas pobierania i wczytywania treści" + msgstr "Erro ao obter e carregar o conteúdo" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" - msgstr "Nie odnaleziono treści" + msgstr "Nenhum conteúdo encontrado" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" - msgstr "Wykryto błędną konfigurację" + msgstr "Detetada má configuração" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" - msgstr "Pojawiły się ostrzeżenia" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" - msgstr "Wszystko jest w porządku" + msgstr "Está tudo bem" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" - msgstr "Nieprawidłowy lub nieobsługiwany adres URL" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." - msgstr "Pobieranie treści…" - - #: tmp/oscap.glade.h:1 - msgid "SECURITY POLICY" --msgstr "POLITYKA BEZPIECZEŃSTWA" -+msgstr "ZASADY BEZPIECZEŃSTWA" - - #: tmp/oscap.glade.h:2 - msgid "_Change content" -@@ -270,7 +284,7 @@ - - #: tmp/oscap.glade.h:3 - msgid "Apply security policy:" --msgstr "Zastosowanie polityki bezpieczeństwa:" -+msgstr "Zastosowanie zasad bezpieczeństwa:" - - #: tmp/oscap.glade.h:4 - msgid "Data stream:" -@@ -304,11 +318,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_Użycie przewodnika bezpieczeństwa SCAP" + msgstr "O obter o conteúdo..." --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- - #: tmp/oscap.glade.h:13 - msgid "_Fetch" - msgstr "_Pobierz" -Binary files a/po/pt_BR.mo and b/po/pt_BR.mo differ -diff -U3 -N -r a/po/pt_BR.po b/po/pt_BR.po ---- a/po/pt_BR.po 2020-06-02 14:21:38.000000000 +0200 -+++ b/po/pt_BR.po 2021-02-15 11:32:20.362504514 +0100 -@@ -4,15 +4,14 @@ - # - # Translators: - # Marcelo Barbosa , 2014 --# Marco Aurélio Krause , 2015. #zanata --# Ludek Janda , 2018. #zanata -+# Marco Aurélio Krause , 2016. #zanata - # Ludek Janda , 2019. #zanata - msgid "" +diff -U3 -N -r a/po/ru.po b/po/ru.po +--- a/po/ru.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/ru.po 2021-07-16 11:11:54.663604756 +0200 +@@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2019-02-12 02:12+0000\n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2019-08-30 10:52-0400\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" + "PO-Revision-Date: 2019-08-27 03:32-0400\n" "Last-Translator: Ludek Janda \n" - "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/pt_BR/)\n" - "Language: pt_BR\n" -@@ -22,7 +21,7 @@ - "Plural-Forms: nplurals=2; plural=(n > 1);\n" + "Language-Team: \n" +@@ -11,10 +11,35 @@ + "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<12 || n%100>14) ? 1 : 2);\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" ++"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, fuzzy, python-brace-format ++#| msgid "The integrity check of the content failed. Cannot use the content." ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "" ++"Не удалось проверить целостность содержимого. Невозможно использовать " ++"контент." ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -34,7 +33,7 @@ - " um perfil de segurança" +@@ -26,7 +51,7 @@ + "безопасности" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -43,20 +42,20 @@ +@@ -35,17 +60,17 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, 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" + msgstr "не забудьте создать пароль с минимальной длиной %d персонажи" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" - msgstr "" - "Não é possível verificar o comprimento da senha do root (senha " - "criptografada)" + msgstr "не удается проверить длину пароля root (пароль зашифрован)" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " -@@ -65,36 +64,44 @@ - "A senha root é muito curta, uma mais longa com pelo menos %d caracteres são " - "obrigatórios" +@@ -54,13 +79,13 @@ + "пароль root слишком короткий, более длинный с по крайней мере %d требуется " + "персонаж" --#: ../org_fedora_oscap/rule_handling.py:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, 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" + msgstr "пакет '%s'добавлен в список установленных пакетов" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -68,30 +93,30 @@ + "installation." + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, 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" + msgstr "пакет '%s'добавлен в список исключенных пакетов" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" - msgstr "O Kdump será desativado na inicialização" + msgstr "Kdump будет отключен при запуске" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" - msgstr "O Kdump será ativado na inicialização" + msgstr "Kdump будет включен при запуске" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" - msgstr "Firewall será desativado na inicialização" + msgstr "Брандмауэр будет отключен при запуске" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" - msgstr "Firewall será ativado na inicialização" + msgstr "Брандмауэр будет включен при запуске" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, python-format msgid "" "service '%s' has been added to the list of services to be added to the " -@@ -103,16 +110,16 @@ - "serviço '%s'foi adicionado à lista de serviços a serem adicionados ao " - "firewall" - --#: ../org_fedora_oscap/rule_handling.py:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +@@ -100,16 +125,16 @@ + "оказание услуг '%s'добавлен в список служб, которые будут добавлены в " + "брандмауэр" + +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, 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" + "порт '%s'добавлен в список портов, которые будут добавлены в брандмауэр" --#: ../org_fedora_oscap/rule_handling.py:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, python-format msgid "" "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -120,8 +127,8 @@ - "Confiar em '%s'foi adicionado à lista de relações de confiança a serem " - "adicionadas ao firewall" +@@ -117,8 +142,8 @@ + "доверие \"%s'добавлен в список доверенностей, которые будут добавлены в " + "брандмауэр" --#: ../org_fedora_oscap/rule_handling.py:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -150,41 +157,41 @@ +@@ -127,129 +152,143 @@ + "оказание услуг '%s'добавлен в список служб, которые необходимо удалить из " + "брандмауэра" + +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." + msgstr "" +-"Ошибка получения и загрузки содержимого безопасности:%sУстановка должна быть" +-" прервана. Вы все равно хотите продолжить?" + +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../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." ++msgid "The integrity check of the security content failed." ++msgstr "" ++"Не удалось проверить целостность содержимого. Невозможно использовать " ++"контент." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++#, 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 ++msgid "There was an unexpected problem with the supplied content." + msgstr "" +-"Не удалось проверить целостность содержимого безопасности. Установка должна " +-"быть прервана. Вы все равно хотите продолжить?" ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "Обнаружено несоответствие" #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "_POLÍTICA DE SEGURANÇA" -+msgid "_Security Policy" -+msgstr "_Política de Segurança " +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "_Политика безопасности" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" - msgstr "Ainda não esta pronto" + msgstr "Не готов" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" - msgstr "Buscando dados de conteúdo" + msgstr "Получение данных контента" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" - msgstr "Nenhum perfil selecionado" + msgstr "Не выбран профиль" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" - msgstr "Não há regras para a fase de pré-instalação" + msgstr "Нет правил для этапа предварительной установки" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." - msgstr "Conteúdo fornecido é inválido. Digite uma URL diferente, por favor." + msgstr "Недопустимый контент. Введите другой URL-адрес, пожалуйста." --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 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." + msgstr "Неверный или неподдерживаемый URL-адрес контента, введите другой." --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Falha ao buscar conteúdo. Digite uma URL diferente, por favor." + msgstr "Не удалось получить контент. Введите другой URL-адрес, пожалуйста." --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." -@@ -192,19 +199,19 @@ - "Foi encontrado um erro na rede ao buscar dados. Verifique se a rede está " - "configurada e funcionando." + msgstr "" + "Ошибка сети при сборе данных. Убедитесь, что сеть настроена и работает." --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 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:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, 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." +-msgstr "" +-"Не удалось извлечь контент (%s). Введите другой URL-адрес, пожалуйста." ++msgstr "Не удалось извлечь контент (%s). Введите другой URL-адрес, пожалуйста." --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," -@@ -213,48 +220,48 @@ - "Perfil com ID '%s' não definido no conteúdo. Selecione um perfil diferente, " - "por favor" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" + msgstr "" + "Профиль с идентификатором '%s'не определено в контенте. Выберите другой " + "профиль, пожалуйста" --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" - msgstr "Não aplicar a política de segurança" + msgstr "Не применять политику безопасности" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" - msgstr "ou inserir conteúdo de fluxo de dados ou arquivo de URL abaixo:" + msgstr " или введите содержимое потока данных или URL-адрес архива ниже:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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:" + "Контент не найден. Введите содержимое потока данных или URL-адрес архива " + "ниже:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" - msgstr "Erro ao buscar e carregar o conteúdo" + msgstr "Ошибка получения и загрузки содержимого" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" - msgstr "Nenhum conteúdo encontrado" + msgstr "Не найдено ни одного контента" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" - msgstr "Misconfiguration detectado" + msgstr "Обнаружено несоответствие" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" - msgstr "Advertências surgidas" + msgstr "Появились предупреждения" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" - msgstr "Tudo bem" + msgstr "Все в порядке" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" - msgstr "URL inválida ou não suportada" + msgstr "Недействительный или неподдерживаемый URL" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." - msgstr "Buscando conteúdo..." - -@@ -302,11 +309,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_Use SCAP Segurança Guia" + msgstr "Получение контента ..." --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -300,3 +339,18 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" --msgstr "Buscar(_F)" -+msgstr "_Buscar" -Binary files a/po/pt.mo and b/po/pt.mo differ -diff -U3 -N -r a/po/pt.po b/po/pt.po ---- a/po/pt.po 2020-06-02 14:21:37.000000000 +0200 -+++ b/po/pt.po 2021-02-15 11:32:20.362504514 +0100 -@@ -3,8 +3,8 @@ + msgstr "_Получить" ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Ошибка получения и загрузки содержимого безопасности:%sУстановка должна " ++#~ "быть прервана. Вы все равно хотите продолжить?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Не удалось проверить целостность содержимого безопасности. Установка " ++#~ "должна быть прервана. Вы все равно хотите продолжить?" +diff -U3 -N -r a/po/si.po b/po/si.po +--- a/po/si.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/si.po 2021-07-16 11:11:54.663604756 +0200 +@@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2015-09-13 10:49+0000\n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2015-09-12 01:40-0400\n" - "Last-Translator: Manuela Silva \n" - "Language-Team: Portuguese\n" - "Language: pt\n" -@@ -14,7 +14,7 @@ - "Plural-Forms: nplurals=2; plural=(n != 1)\n" - "X-Generator: Zanata 4.6.2\n" +-"POT-Creation-Date: 2020-08-27 15:51+0200\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" +@@ -15,7 +15,28 @@ + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, python-brace-format ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "" ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -23,87 +23,90 @@ +@@ -24,37 +45,37 @@ msgstr "" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" msgstr "" --"opção de montagem '%(mount_option)s' adicionada ao ponto de montagem " --"%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, python-format msgid "make sure to create password with minimal length of %d characters" msgstr "" --"certifique-se que cria a senha com o comprimento mínimo de %d carateres" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" msgstr "" --"não é possível verificar o comprimento da senha \"root\" (a senha está " --"encriptada)" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, 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:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, python-format msgid "package '%s' has been added to the list of to be installed packages" msgstr "" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -62,169 +83,180 @@ + "installation." + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, python-format msgid "package '%s' has been added to the list of excluded packages" msgstr "" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" msgstr "" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" msgstr "" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" msgstr "" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" msgstr "" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, 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:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, 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:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, 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:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -126,101 +129,101 @@ + "firewall" + msgstr "" - #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "POLÍTICA DE _SEGURANÇA" -+msgid "_Security Policy" +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." + msgstr "" + +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:377 ++msgid "Do you wish to continue anyway?" +msgstr "" ++ ++#: ../org_fedora_oscap/ks/oscap.py:400 ++msgid "The integrity check of the security content failed." ++msgstr "" ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++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 ++msgid "There was an unexpected problem with the supplied content." ++msgstr "" ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++msgid "Wrong configuration detected!" + msgstr "" + + #. title of the spoke (will be displayed on the hub) +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" --msgstr "Obter dados de conteúdo" -+msgstr "A obter dados de conteúdo" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" - msgstr "Nenhum perfil selecionado" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 msgid "Invalid or unsupported content URL, please enter a different one." msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 msgid "The integrity check of the content failed. Cannot use the content." msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, python-format msgid "Failed to extract content (%s). Enter a different URL, please." msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" + "Profile with ID '%s' not defined in the content. Select a different profile, " + "please" msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" msgstr "" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" --msgstr "" -+msgstr "Erro ao obter e carregar o conteúdo" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" - msgstr "Nenhum conteúdo encontrado" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" - msgstr "Detetada má configuração" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" - msgstr "Está tudo bem" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" --msgstr "URL inválido ou não suportado" -+msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 - msgid "Fetching content..." - msgstr "O obter o conteúdo..." - -@@ -234,7 +237,7 @@ - - #: tmp/oscap.glade.h:3 - msgid "Apply security policy:" --msgstr "Aplicar política de segurança:" -+msgstr "" - - #: tmp/oscap.glade.h:4 - msgid "Data stream:" -@@ -246,33 +249,28 @@ - - #: tmp/oscap.glade.h:6 - msgid "Choose profile below:" --msgstr "Escolha o perfil abaixo:" -+msgstr "" - - #: tmp/oscap.glade.h:7 - msgid "Profile" --msgstr "Perfil" -+msgstr "" - - #: tmp/oscap.glade.h:8 - msgid "Selected" --msgstr "Selecionado" -+msgstr "" - - #: tmp/oscap.glade.h:9 - msgid "_Select profile" --msgstr "_Selecionar perfil" -+msgstr "" - - #: tmp/oscap.glade.h:10 - msgid "Changes that were done or need to be done:" --msgstr "Alterações que foram concluídas ou precisam de ser concluídas" -+msgstr "" - - #: tmp/oscap.glade.h:11 - msgid "_Use SCAP Security Guide" --msgstr "_Utilize o Guia de Segurança SCAP" -- --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" msgstr "" - - #: tmp/oscap.glade.h:13 - msgid "_Fetch" --msgstr "_Obter" -+msgstr "" -Binary files a/po/ru.mo and b/po/ru.mo differ -diff -U3 -N -r a/po/ru.po b/po/ru.po ---- a/po/ru.po 2020-06-02 14:21:40.000000000 +0200 -+++ b/po/ru.po 2021-02-15 11:32:20.362504514 +0100 -@@ -1,11 +1,10 @@ --# Ludek Janda , 2018. #zanata - # Ludek Janda , 2019. #zanata - msgid "" + +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 + msgid "Fetching content..." + msgstr "" + +diff -U3 -N -r a/po/sr.po b/po/sr.po +--- a/po/sr.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/sr.po 2021-07-16 11:11:54.663604756 +0200 +@@ -9,18 +9,41 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2019-02-12 02:17+0000\n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2019-08-27 03:32-0400\n" - "Last-Translator: Ludek Janda \n" - "Language-Team: \n" - "Language: ru\n" -@@ -15,7 +14,7 @@ - "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"POT-Creation-Date: 2021-06-21 11:51+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-addon/language/sr/)\n" ++"Language-Team: Serbian (http://www.transifex.com/projects/p/oscap-anaconda-" ++"addon/language/sr/)\n" + "Language: sr\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" ++"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: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, python-brace-format ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "" ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -27,7 +26,7 @@ - "безопасности" +@@ -29,39 +52,38 @@ + msgstr "" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -36,17 +35,17 @@ - "%(mount_point)s" + msgstr "" +-"прикључна опција '%(mount_option)s' додата за прикључну тачку " +-"%(mount_point)s" ++"прикључна опција '%(mount_option)s' додата за прикључну тачку %(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, python-format msgid "make sure to create password with minimal length of %d characters" - msgstr "не забудьте создать пароль с минимальной длиной %d персонажи" + msgstr "изаберите шифру од најмање %d карактера" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" - msgstr "не удается проверить длину пароля root (пароль зашифрован)" + msgstr "немогуће проверити дужину root шифре (шифра је криптована)" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " -@@ -55,36 +54,44 @@ - "пароль root слишком короткий, более длинный с по крайней мере %d требуется " - "персонаж" + "required" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, python-format msgid "package '%s' has been added to the list of to be installed packages" - msgstr "пакет '%s'добавлен в список установленных пакетов" + msgstr "пакет '%s' је додат на листу пакета за инсталацију" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -69,171 +91,184 @@ + "installation." + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, python-format msgid "package '%s' has been added to the list of excluded packages" - msgstr "пакет '%s'добавлен в список исключенных пакетов" + msgstr "пакет '%s' је додат на листу искључених пакета" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" - msgstr "Kdump будет отключен при запуске" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" - msgstr "Kdump будет включен при запуске" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" - msgstr "Брандмауэр будет отключен при запуске" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" - msgstr "Брандмауэр будет включен при запуске" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, python-format msgid "" "service '%s' has been added to the list of services to be added to the " -@@ -93,16 +100,16 @@ - "оказание услуг '%s'добавлен в список служб, которые будут добавлены в " - "брандмауэр" + "firewall" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, 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:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, python-format msgid "" "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -110,8 +117,8 @@ - "доверие \"%s'добавлен в список доверенностей, которые будут добавлены в " - "брандмауэр" + msgstr "" --#: ../org_fedora_oscap/rule_handling.py:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -140,59 +147,59 @@ + "firewall" + msgstr "" + +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." + msgstr "" +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:377 ++msgid "Do you wish to continue anyway?" ++msgstr "" ++ ++#: ../org_fedora_oscap/ks/oscap.py:400 ++msgid "The integrity check of the security content failed." ++msgstr "" ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++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 ++msgid "There was an unexpected problem with the supplied content." + msgstr "" + ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "Погрешно подешавање откривено" ++ #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "_ПОЛИТИКА БЕЗОПАСНОСТИ" -+msgid "_Security Policy" -+msgstr "_Политика безопасности" +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" - msgstr "Не готов" + msgstr "Није спремно" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" - msgstr "Получение данных контента" + msgstr "Преузимање података о садржају" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" - msgstr "Не выбран профиль" + msgstr "Није изабран профил" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" - msgstr "Нет правил для этапа предварительной установки" + msgstr "Нема правила за пред-инсталациону фазу" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." - msgstr "Недопустимый контент. Введите другой URL-адрес, пожалуйста." + msgstr "Неисправан садржај пружен. Унесите други URL, молим." --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "Неверный или неподдерживаемый URL-адрес контента, введите другой." + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Не удалось получить контент. Введите другой URL-адрес, пожалуйста." + msgstr "Неуспешно преузимање садржаја. Унесите други URL, молим." --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." msgstr "" - "Ошибка сети при сборе данных. Убедитесь, что сеть настроена и работает." --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 msgid "The integrity check of the content failed. Cannot use the content." msgstr "" - "Не удалось проверить целостность содержимого. Невозможно использовать " - "контент." --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, python-format msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "" - "Не удалось извлечь контент (%s). Введите другой URL-адрес, пожалуйста." + msgstr "Неуспешно извлачење садржаја (%s). Унесите други URL, молим." --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," -@@ -201,48 +208,48 @@ - "Профиль с идентификатором '%s'не определено в контенте. Выберите другой " - "профиль, пожалуйста" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" - msgstr "Не применять политику безопасности" + msgstr "Не примењујем полису безбедности" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" - msgstr " или введите содержимое потока данных или URL-адрес архива ниже:" + msgstr "или унесите садржајни или архивски URL за stream података испод:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 msgid "" "No content found. Please enter data stream content or archive URL below:" msgstr "" - "Контент не найден. Введите содержимое потока данных или URL-адрес архива " - "ниже:" + "Садржај није пронађен. Молим унесите садржајни или архивски URL за stream " + "података:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" - msgstr "Ошибка получения и загрузки содержимого" + msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" - msgstr "Не найдено ни одного контента" + msgstr "Садржај није пронађен" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" - msgstr "Обнаружено несоответствие" + msgstr "Погрешно подешавање откривено" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" - msgstr "Появились предупреждения" + msgstr "Упозорења су се појавила" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" - msgstr "Все в порядке" + msgstr "Све је у реду" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" - msgstr "Недействительный или неподдерживаемый URL" + msgstr "Неисправан или неподржан URL" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." - msgstr "Получение контента ..." - -@@ -290,11 +297,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_Используйте руководство по безопасности SCAP" + msgstr "Преузимање садржаја..." --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- - #: tmp/oscap.glade.h:13 - msgid "_Fetch" - msgstr "_Получить" -Binary files a/po/sr.mo and b/po/sr.mo differ -diff -U3 -N -r a/po/sr.po b/po/sr.po ---- a/po/sr.po 2020-06-02 14:21:41.000000000 +0200 -+++ b/po/sr.po 2021-02-15 11:32:20.362504514 +0100 -@@ -9,8 +9,8 @@ +diff -U3 -N -r a/po/sv.po b/po/sv.po +--- a/po/sv.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/sv.po 2021-07-16 11:11:54.663604756 +0200 +@@ -1,11 +1,12 @@ + # Göran Uddeborg , 2019. #zanata, 2020. ++# Luna Jernberg , 2021. + msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2015-04-18 01:39+0000\n" -+"POT-Creation-Date: 2020-07-09 17:35+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-addon/language/sr/)\n" - "Language: sr\n" -@@ -20,7 +20,7 @@ - "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: Zanata 4.6.2\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" +-"PO-Revision-Date: 2020-09-08 14:29+0000\n" +-"Last-Translator: Göran Uddeborg \n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" ++"PO-Revision-Date: 2021-06-26 19:04+0000\n" ++"Last-Translator: Luna Jernberg \n" + "Language-Team: Swedish \n" + "Language: sv\n" +@@ -13,21 +14,45 @@ + "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.7\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++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." ++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." ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -29,7 +29,7 @@ + "in the partitioning layout before installation can occur with a security " + "profile" msgstr "" +-"{0} måste finnas på en separat partition eller logisk volym och måste skapas" +-" i partitioneringslayouten före installationen kan ske med en " +-"säkerhetsprofil" ++"{0} måste finnas på en separat partition eller logisk volym och måste skapas " ++"i partitioneringslayouten före installationen kan ske med en säkerhetsprofil" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -38,75 +38,83 @@ +@@ -36,31 +61,30 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, python-format msgid "make sure to create password with minimal length of %d characters" - msgstr "изаберите шифру од најмање %d карактера" + msgstr "se till att skapa lösenord med minsta längd av %d tecken" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" - msgstr "немогуће проверити дужину root шифре (шифра је криптована)" + msgstr "kan inte kontrollera root-lösenordets längd (lösenordet är krypterat)" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " "required" - msgstr "" +-msgstr "" +-"root-lösenordet är för kort, ett längre med åtminstone %d tecken krävs" ++msgstr "root-lösenordet är för kort, ett längre med åtminstone %d tecken krävs" --#: ../org_fedora_oscap/rule_handling.py:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, python-format msgid "package '%s' has been added to the list of to be installed packages" - msgstr "пакет '%s' је додат на листу пакета за инсталацију" + msgstr "paketet ”%s” har lagts till till listan av paket att installeras" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -71,30 +95,30 @@ + "kan inte tas bort från det aktuella programvaruvalet utan att göra sönder " + "installationen." + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, python-format msgid "package '%s' has been added to the list of excluded packages" - msgstr "пакет '%s' је додат на листу искључених пакета" + msgstr "paketet ”%s” har lagts till till listan av uteslutna paket" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" - msgstr "" + msgstr "Kdump kommer avaktiveras vid uppstart" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" - msgstr "" + msgstr "Kdump kommer aktiveras vid uppstart" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" - msgstr "" + msgstr "Brandväggen kommer avaktiveras vid uppstart" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" - msgstr "" + msgstr "Brandväggen kommer aktiveras vid uppstart" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, python-format msgid "" "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "" +@@ -103,8 +127,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:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, python-format msgid "" "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "" +@@ -112,8 +136,8 @@ + "porten ”%s”har lagts till till listan över portar att läggas till i " + "brandväggen" --#: ../org_fedora_oscap/rule_handling.py:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, python-format msgid "" "trust '%s' has been added to the list of trusts to be added to the firewall" - msgstr "" +@@ -121,8 +145,8 @@ + "förtroendet ”%s” har lagts till till listan över förtoenden att läggas till " + "i brandväggen" --#: ../org_fedora_oscap/rule_handling.py:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -129,103 +137,103 @@ +@@ -131,61 +155,67 @@ + "tjänsten ”%s” har lagts till till listan över tjänster att tas bort från " + "brandväggen" + +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +-"Ett fel uppstod när säkerhetskontexten hämtades och laddades:\n" +-"%s\n" +-"Installationen bör avbrytas. Önskar du ändå fortsätta?" +- +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +-"Integritetskontrollen av säkerhetsinnehållet misslyckades.\n" +-"Installationen bör avbrytas. Önskar du fortsätta ändå?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." ++msgstr "Installationen kommer att avbrytas." ++ ++#: ../org_fedora_oscap/ks/oscap.py:377 ++msgid "Do you wish to continue anyway?" ++msgstr "Vill du fortsätta ändå?" ++ ++#: ../org_fedora_oscap/ks/oscap.py:400 ++msgid "The integrity check of the security content failed." ++msgstr "Integritetskontrollen av säkerhetsinnehållet misslyckades." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++msgid "There was an error fetching and loading the security content:\n" ++msgstr "Det var ett fel när säkerhetsinnehållet hämtades och laddades:\n" ++ ++#: ../org_fedora_oscap/ks/oscap.py:409 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:774 ++msgid "There was an unexpected problem with the supplied content." ++msgstr "Det uppstod ett oväntat problem med det levererade innehållet." ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++msgid "Wrong configuration detected!" ++msgstr "Felkonfiguration upptäckt!" #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "_БЕЗБЕДНОСНИ МОДЕЛ" -+msgid "_Security Policy" -+msgstr "" +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "_Säkerhetspolicy" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" - msgstr "Није спремно" + msgstr "Inte redo" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" - msgstr "Преузимање података о садржају" + msgstr "Hämtar innehållsdata" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" - msgstr "Није изабран профил" + msgstr "Ingen profil vald" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" - msgstr "Нема правила за пред-инсталациону фазу" + msgstr "Inga regler för förinstallationsfasen" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." - msgstr "Неисправан садржај пружен. Унесите други URL, молим." + msgstr "Felaktigt innehåll tillhandahölls. Ange en annan URL." --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "" + msgstr "Felaktig eller ej stödd innehålls-URL, ange en annan." --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Неуспешно преузимање садржаја. Унесите други URL, молим." + msgstr "Misslyckades att hämta innehåll. Ange en annan URL." --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." - msgstr "" +@@ -193,65 +223,65 @@ + "Nätverksfel uppstod när data hämtades. Kontrollera att nätverket är uppsatt " + "och fungerar." --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 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:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, python-format msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "Неуспешно извлачење садржаја (%s). Унесите други URL, молим." + msgstr "Misslyckades att extrahera innehållet (%s). Ange en annan URL." --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" msgstr "" + "Profilen med ID ”%s” är inte definierad i innehållet. Välj en annan profil" --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" - msgstr "Не примењујем полису безбедности" + msgstr "Tillämpar inte säkerhetspolicyn" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" - msgstr "или унесите садржајни или архивски URL за stream података испод:" + msgstr " eller ange ett dataströmsinnehåll eller en arkiv-URL nedan:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 msgid "" "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "Садржај није пронађен. Молим унесите садржајни или архивски URL за stream " - "података:" + msgstr "Inget innehåll hittat. Ange dataströmsinnehåll eller arkiv-URL nedan:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" - msgstr "" + msgstr "Fel när innehåll hämtades och laddades" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" - msgstr "Садржај није пронађен" + msgstr "Inget innehåll hittat" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" - msgstr "Погрешно подешавање откривено" + msgstr "Felkonfiguration upptäckt" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" - msgstr "Упозорења су се појавила" + msgstr "Varningar uppstod" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" - msgstr "Све је у реду" + msgstr "Allting okej" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" - msgstr "Неисправан или неподржан URL" + msgstr "Felaktig eller ej stödd URL" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." - msgstr "Преузимање садржаја..." + msgstr "Hämtar innehåll …" -@@ -273,11 +281,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_Користи SCAP сигурносни водич" - --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -302,3 +332,19 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" - msgstr "_Преузми" -diff -U3 -N -r a/po/sv.po b/po/sv.po ---- a/po/sv.po 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/sv.po 2021-02-15 11:32:20.362504514 +0100 -@@ -0,0 +1,304 @@ -+# Göran Uddeborg , 2019. #zanata, 2020. -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2020-09-08 14:29+0000\n" -+"Last-Translator: Göran Uddeborg \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" -+ -+#: ../org_fedora_oscap/rule_handling.py:409 -+#, 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} måste finnas på en separat partition eller logisk volym och måste skapas" -+" i partitioneringslayouten före installationen kan ske med en " -+"säkerhetsprofil" -+ -+#. template for the message -+#: ../org_fedora_oscap/rule_handling.py:420 -+#, python-format -+msgid "" -+"mount option '%(mount_option)s' added for the mount point %(mount_point)s" -+msgstr "" -+"monteringsflaggan ”%(mount_option)s” tillagd för monteringspunkten " -+"%(mount_point)s" -+ -+#. root password was not set -+#: ../org_fedora_oscap/rule_handling.py:529 -+#, 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:536 -+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:542 -+#, 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" + msgstr "_Hämta" + -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 -+#, 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" ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Ett fel uppstod när säkerhetskontexten hämtades och laddades:\n" ++#~ "%s\n" ++#~ "Installationen bör avbrytas. Önskar du ändå fortsätta?" + -+#: ../org_fedora_oscap/rule_handling.py:685 ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Integritetskontrollen av säkerhetsinnehållet misslyckades.\n" ++#~ "Installationen bör avbrytas. Önskar du fortsätta ändå?" +diff -U3 -N -r a/po/uk.po b/po/uk.po +--- a/po/uk.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/uk.po 2021-07-16 11:11:54.663604756 +0200 +@@ -1,11 +1,11 @@ +-# Yuri Chornoivan , 2015, 2020. +-# Yuri Chornoivan , 2015. #zanata, 2020. ++# Yuri Chornoivan , 2015, 2020, 2021. ++# Yuri Chornoivan , 2015. #zanata, 2020, 2021. + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" +-"PO-Revision-Date: 2020-09-13 14:29+0000\n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" ++"PO-Revision-Date: 2021-06-25 11:04+0000\n" + "Last-Translator: Yuri Chornoivan \n" + "Language-Team: Ukrainian \n" +@@ -15,9 +15,34 @@ + "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.7\n" + +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 +#, 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 "" -+"paketet ”{package}” har lagts till till listan över uteslutna paket, men det " -+"kan inte tas bort från det aktuella programvaruvalet utan att göra sönder " -+"installationen." -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 -+#, 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:808 -+msgid "Kdump will be disabled on startup" -+msgstr "Kdump kommer avaktiveras vid uppstart" -+ -+#: ../org_fedora_oscap/rule_handling.py:810 -+msgid "Kdump will be enabled on startup" -+msgstr "Kdump kommer aktiveras vid uppstart" -+ -+#: ../org_fedora_oscap/rule_handling.py:963 -+msgid "Firewall will be disabled on startup" -+msgstr "Brandväggen kommer avaktiveras vid uppstart" -+ -+#: ../org_fedora_oscap/rule_handling.py:970 -+msgid "Firewall will be enabled on startup" -+msgstr "Brandväggen kommer aktiveras vid uppstart" -+ -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 -+#, python-format -+msgid "" -+"service '%s' has been added to the list of services to be added to the " -+"firewall" -+msgstr "" -+"tjänsten ”%s”har lagts till till listan över tjänster att läggas till i " -+"brandväggen" -+ -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 -+#, python-format -+msgid "" -+"port '%s' has been added to the list of ports to be added to the firewall" -+msgstr "" -+"porten ”%s”har lagts till till listan över portar att läggas till i " -+"brandväggen" -+ -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 -+#, 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 " -+"i brandväggen" -+ -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 -+#, python-format -+msgid "" -+"service '%s' has been added to the list of services to be removed from the " -+"firewall" -+msgstr "" -+"tjänsten ”%s” har lagts till till listan över tjänster att tas bort från " -+"brandväggen" -+ -+#: ../org_fedora_oscap/ks/oscap.py:418 -+#, python-format -+msgid "" -+"There was an error fetching and loading the security content:\n" -+"%s\n" -+"The installation should be aborted. Do you wish to continue anyway?" -+msgstr "" -+"Ett fel uppstod när säkerhetskontexten hämtades och laddades:\n" -+"%s\n" -+"Installationen bör avbrytas. Önskar du ändå fortsätta?" -+ -+#: ../org_fedora_oscap/ks/oscap.py:447 -+msgid "" -+"The integrity check of the security content failed.\n" -+"The installation should be aborted. Do you wish to continue anyway?" -+msgstr "" -+"Integritetskontrollen av säkerhetsinnehållet misslyckades.\n" -+"Installationen bör avbrytas. Önskar du fortsätta ändå?" -+ -+#. title of the spoke (will be displayed on the hub) -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 -+msgid "_Security Policy" -+msgstr "_Säkerhetspolicy" -+ -+#. the first status provided -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 -+msgid "Not ready" -+msgstr "Inte redo" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 -+msgid "Fetching content data" -+msgstr "Hämtar innehållsdata" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 -+msgid "No profile selected" -+msgstr "Ingen profil vald" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 -+msgid "No rules for the pre-installation phase" -+msgstr "Inga regler för förinstallationsfasen" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 -+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:806 -+msgid "Invalid or unsupported content URL, please enter a different one." -+msgstr "Felaktig eller ej stödd innehålls-URL, ange en annan." ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "Помилка під час спроби видобути дані з архіву як файла zip: {exc}" + -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 -+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:822 ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, python-brace-format +msgid "" -+"Network error encountered when fetching data. Please check that network is " -+"setup and working." ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" +msgstr "" -+"Nätverksfel uppstod när data hämtades. Kontrollera att nätverket är uppsatt " -+"och fungerar." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 -+msgid "The integrity check of the content failed. Cannot use the content." -+msgstr "" -+"Integritetskontrollen av innehållet misslyckades. Kan inte använda " -+"innehållet." ++"Не пройдено перевірку цілісності даних — хеш {hash_obj.name} не збігається з " ++"еталонним" + -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 -+#, 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/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++msgstr "Для отримання даних потрібне з'єднання з мережею." + -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 -+#, python-format ++#: ../org_fedora_oscap/data_fetch.py:262 ++#, python-brace-format +msgid "" -+"Profile with ID '%s' not defined in the content. Select a different profile," -+" please" ++"Failed to fetch data - the request returned HTTP error code {return_code}" +msgstr "" -+"Profilen med ID ”%s” är inte definierad i innehållet. Välj en annan profil" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 -+msgid "Not applying security policy" -+msgstr "Tillämpar inte säkerhetspolicyn" -+ -+#. TRANSLATORS: the other choice if SCAP Security Guide is also -+#. available -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 -+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:908 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:1046 -+msgid "Error fetching and loading content" -+msgstr "Fel när innehåll hämtades och laddades" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 -+msgid "No content found" -+msgstr "Inget innehåll hittat" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 -+msgid "Misconfiguration detected" -+msgstr "Felkonfiguration upptäckt" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 -+msgid "Warnings appeared" -+msgstr "Varningar uppstod" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 -+msgid "Everything okay" -+msgstr "Allting okej" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 -+msgid "Invalid or unsupported URL" -+msgstr "Felaktig eller ej stödd URL" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 -+msgid "Fetching content..." -+msgstr "Hämtar innehåll …" -+ -+#: tmp/oscap.glade.h:1 -+msgid "SECURITY POLICY" -+msgstr "SÄKERHETSPOLICY" -+ -+#: tmp/oscap.glade.h:2 -+msgid "_Change content" -+msgstr "_Ändra innehåll" -+ -+#: tmp/oscap.glade.h:3 -+msgid "Apply security policy:" -+msgstr "Tillämpa säkerhetspolicy:" -+ -+#: tmp/oscap.glade.h:4 -+msgid "Data stream:" -+msgstr "Dataström:" -+ -+#: tmp/oscap.glade.h:5 -+msgid "Checklist:" -+msgstr "Checklista:" ++"Не вдалося отримати дані — у відповідь на запит отримано код помилки HTTP " ++"{return_code}" + -+#: tmp/oscap.glade.h:6 -+msgid "Choose profile below:" -+msgstr "Välj profil nedan:" -+ -+#: tmp/oscap.glade.h:7 -+msgid "Profile" -+msgstr "Profil" -+ -+#: tmp/oscap.glade.h:8 -+msgid "Selected" -+msgstr "Vald" -+ -+#: tmp/oscap.glade.h:9 -+msgid "_Select profile" -+msgstr "_Välj profil" -+ -+#: tmp/oscap.glade.h:10 -+msgid "Changes that were done or need to be done:" -+msgstr "Ändringar som gjordes eller behöver göras:" -+ -+#: tmp/oscap.glade.h:11 -+msgid "_Use SCAP Security Guide" -+msgstr "_Använd SCAP säkerhetsguide" -+ -+#: tmp/oscap.glade.h:13 -+msgid "_Fetch" -+msgstr "_Hämta" -Binary files a/po/uk.mo and b/po/uk.mo differ -diff -U3 -N -r a/po/uk.po b/po/uk.po ---- a/po/uk.po 2020-06-02 14:21:52.000000000 +0200 -+++ b/po/uk.po 2021-02-15 11:32:20.362504514 +0100 -@@ -1,21 +1,23 @@ --# Yuri Chornoivan , 2015. --# Yuri Chornoivan , 2018. #zanata -+# Yuri Chornoivan , 2015, 2020. -+# Yuri Chornoivan , 2015. #zanata, 2020. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2018-07-02 03:40+0000\n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2020-09-13 14:29+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: Zanata 4.6.2\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" - --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -27,7 +29,7 @@ +@@ -29,7 +54,7 @@ "захисту" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, python-format msgid "" "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -36,71 +38,79 @@ +@@ -38,30 +63,31 @@ "«%(mount_option)s»" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, python-format msgid "make sure to create password with minimal length of %d characters" msgstr "довжина пароля має бути не меншою за %d символів" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" msgstr "не вдалося перевірити довжину пароля root (пароль зашифровано)" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, python-format msgid "" "root password is too short, a longer one with at least %d characters is " "required" --msgstr "" --"пароль root є надто коротким, потрібен довший, принаймні із %d символів" -+msgstr "пароль root є надто коротким, потрібен довший, принаймні із %d символів" +-msgstr "пароль root є надто коротким, потрібен довший, принаймні із %d символів" ++msgstr "" ++"пароль root є надто коротким, потрібен довший, принаймні із %d символів" --#: ../org_fedora_oscap/rule_handling.py:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, python-format msgid "package '%s' has been added to the list of to be installed packages" msgstr "до списку встановлюваних пакунків додано пакунок «%s»" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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}» було додано до списку виключених пакунків, але його не " -+"можна вилучати з поточного вибору програмного забезпечення без того, щоб " -+"ушкодити встановлену систему." -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -72,45 +98,46 @@ + "можна вилучати з поточного вибору програмного забезпечення без того, щоб " + "ушкодити встановлену систему." + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, python-format msgid "package '%s' has been added to the list of excluded packages" msgstr "до списку виключених пакунків додано пакунок «%s»" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" msgstr "Kdump буде вимкнено при запуску" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" msgstr "Kdump буде увімкнено при запуску" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" msgstr "Брандмауер буде вимкнено при запуску" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" msgstr "Брандмауер буде увімкнено при запуску" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, 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:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-msgstr "службу «%s» було додано до списку служб, які слід додати до брандмауера" ++msgstr "" ++"службу «%s» було додано до списку служб, які слід додати до брандмауера" + +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, python-format msgid "" "port '%s' has been added to the list of ports to be added to the firewall" --msgstr "" --"порт «%s» було додано до списку портів, які слід додати до брандмауера" -+msgstr "порт «%s» було додано до списку портів, які слід додати до брандмауера" + msgstr "порт «%s» було додано до списку портів, які слід додати до брандмауера" --#: ../org_fedora_oscap/rule_handling.py:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, python-format msgid "" "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -108,8 +118,8 @@ +@@ -118,8 +145,8 @@ "запис довіри «%s» було додано до списку записів довіри, які слід додати до " "брандмауера" --#: ../org_fedora_oscap/rule_handling.py:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -138,41 +148,41 @@ +@@ -127,62 +154,69 @@ + msgstr "" + "службу «%s» було додано до списку служб, які слід вилучити з брандмауера" + +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +-"Під час отримання та завантаження даних захисту сталася помилка:\n" +-"%s\n" +-"Встановлення слід перервати. Хочете продовжити його попри це?" +- +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +-"Дані захисту не пройшли перевірку на цілісність.\n" +-"Встановлення слід перервати. Хочете продовжити його попри це?" ++#: ../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 ++msgid "The integrity check of the security content failed." ++msgstr "Захищені дані не пройшли перевірку на цілісність." ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++msgid "There was an error fetching and loading the security content:\n" ++msgstr "" ++"Під час спроби отримання та завантаження захищених даних сталася помилка:\n" ++ ++#: ../org_fedora_oscap/ks/oscap.py:409 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:774 ++msgid "There was an unexpected problem with the supplied content." ++msgstr "Виникла непередбачена проблема із наданими даними." ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++msgid "Wrong configuration detected!" ++msgstr "Виявлено помилкові налаштування!" #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "П_РАВИЛА ЗАХИСТУ" -+msgid "_Security Policy" -+msgstr "П_равила безпеки" +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "П_равила безпеки" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" msgstr "Неготовий" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" msgstr "Отримуємо дані" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" msgstr "Не вибрано жодного профілю" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" msgstr "Правил для кроку перед встановленням немає" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." msgstr "Надано некоректні дані. Будь ласка, вкажіть іншу адресу." --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 msgid "Invalid or unsupported content URL, please enter a different one." msgstr "" "Некоректна або непідтримувана адреса даних. Будь ласка, введіть якусь іншу." --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." msgstr "Не вдалося отримати дані. Будь ласка, вкажіть іншу адресу." --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." -@@ -181,16 +191,16 @@ +@@ -191,65 +225,64 @@ "ласка, перевірте, чи правильно налаштовано з’єднання, та чи є воно " "працездатним." --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 msgid "The integrity check of the content failed. Cannot use the content." msgstr "Дані не пройшли перевірку на цілісність. Їхнє використання неможливе." --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, python-format msgid "Failed to extract content (%s). Enter a different URL, please." msgstr "Не вдалося видобути дані (%s). Будь ласка, вкажіть іншу адресу." --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," -@@ -199,47 +209,47 @@ +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" + msgstr "" "Профіль з ідентифікатором «%s» у даних не визначено. Виберіть, будь ласка, " "інший профіль" --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" msgstr "Не застосовуємо правил захисту" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" msgstr " або вкажіть адресу потоку даних чи архіву:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 msgid "" "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "Даних не знайдено. Будь ласка, вкажіть адресу потоку даних або архіву:" +-msgstr "" +-"Даних не знайдено. Будь ласка, вкажіть адресу потоку даних або архіву:" ++msgstr "Даних не знайдено. Будь ласка, вкажіть адресу потоку даних або архіву:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" msgstr "Помилка під час спроби отримання та завантаження даних" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" msgstr "Даних не знайдено" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" msgstr "Виявлено помилки у налаштуваннях" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" msgstr "Отримано попередження" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" msgstr "Все гаразд" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" msgstr "Некоректна або непідтримувана адреса" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." msgstr "Отримуємо дані…" -@@ -287,11 +297,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "Ви_користати настанови із захисту SCAP" - --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -300,3 +333,19 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" msgstr "_Отримати" -Binary files a/po/zh_CN.mo and b/po/zh_CN.mo differ ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Під час отримання та завантаження даних захисту сталася помилка:\n" ++#~ "%s\n" ++#~ "Встановлення слід перервати. Хочете продовжити його попри це?" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "Дані захисту не пройшли перевірку на цілісність.\n" ++#~ "Встановлення слід перервати. Хочете продовжити його попри це?" diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po ---- a/po/zh_CN.po 2020-06-02 14:20:57.000000000 +0200 -+++ b/po/zh_CN.po 2021-02-15 11:32:20.362504514 +0100 -@@ -1,10 +1,11 @@ - # Ludek Janda , 2018. #zanata -+# Ludek Janda , 2020. #zanata - msgid "" +--- a/po/zh_CN.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/zh_CN.po 2021-07-16 11:11:54.663604756 +0200 +@@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2018-11-21 11:52+0000\n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2020-06-26 04:26-0400\n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\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" - "Language: zh_CN\n" -@@ -14,7 +15,7 @@ +@@ -15,221 +15,259 @@ "Plural-Forms: nplurals=1; plural=0\n" "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, fuzzy, python-brace-format ++#| msgid "The integrity check of the content failed. Cannot use the content." ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "内容的完整性检查失败。不能使用这个内容。" ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -23,82 +24,90 @@ - msgstr "{0} 必须在一个独立的分区或逻辑卷上，并需要在带有安全档案的安装进行前，在分区布局中创建" + "in the partitioning layout before installation can occur with a security " + "profile" +-msgstr "{0} 必须在一个独立的分区或逻辑卷上，并需要在带有安全档案的安装进行前，在分区布局中创建" ++msgstr "" ++"{0} 必须在一个独立的分区或逻辑卷上，并需要在带有安全档案的安装进行前，在分区" ++"布局中创建" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, 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:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, python-format msgid "make sure to create password with minimal length of %d characters" msgstr "确保创建的密码长度最少为 %d 个字符" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" msgstr "无法检查 root 密码的长度（密码已加密）" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, 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:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, python-format msgid "package '%s' has been added to the list of to be installed packages" msgstr "软件包 '%s' 已被添加到要被安装的软件包列表中" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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}' 已被添加到排除的软件包列表中，但在不破坏安装的情况下，无法从当前的软件选择中删除。" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, 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}' 已被添加到排除的软件包列表中，但在不破坏安装的情况下，无法从当前的软件选择中删除。" ++msgstr "" ++"软件包 '{package}' 已被添加到排除的软件包列表中，但在不破坏安装的情况下，无法" ++"从当前的软件选择中删除。" + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, python-format msgid "package '%s' has been added to the list of excluded packages" msgstr "软件包 '%s' 已被添加到排除的软件包列表中" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" msgstr "Kdump 将在启动时被禁用" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" msgstr "Kdump 将在启动时被启用" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" msgstr "防火墙将在启动时被禁用" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" msgstr "防火墙将在启动时被启用" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, 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:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, 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:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, 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:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -126,101 +135,101 @@ + "firewall" + msgstr "服务 '%s' 已被添加到要从防火墙删除的服务列表中" + +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." + msgstr "" +-"在获取和加载安全内容时出错：\n" +-"%s\n" +-"安装应该被终止。您希望继续吗？" + +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" ++#: ../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." ++msgid "The integrity check of the security content failed." ++msgstr "内容的完整性检查失败。不能使用这个内容。" ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++#, 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 ++msgid "There was an unexpected problem with the supplied content." + msgstr "" +-"对安全内容的完整性检查失败。\n" +-"安装应该被终止。您希望继续吗？" ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "发现错误配置" #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" --msgstr "安全策略（_S）：" -+msgid "_Security Policy" -+msgstr "安全策略（_S）" +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" + msgstr "安全策略（_S）" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" msgstr "未就绪" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" msgstr "获取内容数据" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" msgstr "没有选择 profile" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" msgstr "没有预安装阶段的规则" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." msgstr "提供无效的内容。请输入一个不同的 URL。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 msgid "Invalid or unsupported content URL, please enter a different one." msgstr "无效或不支持的内容 URL，请输入一个不同的 URL。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." msgstr "获取内容失败。请输入一个不同的 URL。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." msgstr "在获取数据时出现网络错误。请检查网络是否正常。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 msgid "The integrity check of the content failed. Cannot use the content." msgstr "内容的完整性检查失败。不能使用这个内容。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, python-format msgid "Failed to extract content (%s). Enter a different URL, please." msgstr "提取内容 (%s) 失败。请输入一个不同的 URL。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" msgstr "ID 为 '%s' 的档案没有在内容中定义。请选择一个不同的档案" --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" msgstr "没有应用安全策略" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" msgstr "或输入数据流内容或归档 URL：" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" msgstr "获取并加载内容错误" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" msgstr "没有找到内容" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" msgstr "发现错误配置" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" msgstr "出现的警告" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" msgstr "一切正常" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" msgstr "无效或不支持的 URL" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." msgstr "获取内容..." -@@ -262,17 +271,12 @@ - - #: tmp/oscap.glade.h:10 - msgid "Changes that were done or need to be done:" --msgstr "已完成或需要完成的改变" -+msgstr "已完成或需要完成的改变：" - - #: tmp/oscap.glade.h:11 - msgid "_Use SCAP Security Guide" - msgstr "使用 SCAP 安全指南(_U)" - --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -280,3 +318,19 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" msgstr "获取(_F)" -Binary files a/po/zh_TW.mo and b/po/zh_TW.mo differ ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "在获取和加载安全内容时出错：\n" ++#~ "%s\n" ++#~ "安装应该被终止。您希望继续吗？" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "" ++#~ "对安全内容的完整性检查失败。\n" ++#~ "安装应该被终止。您希望继续吗？" diff -U3 -N -r a/po/zh_TW.po b/po/zh_TW.po ---- a/po/zh_TW.po 2020-06-02 14:20:58.000000000 +0200 -+++ b/po/zh_TW.po 2021-02-15 11:32:20.362504514 +0100 -@@ -1,12 +1,11 @@ --# Ludek Janda , 2018. #zanata - # Ludek Janda , 2019. #zanata - msgid "" +--- a/po/zh_TW.po 2021-06-21 11:59:10.000000000 +0200 ++++ b/po/zh_TW.po 2021-07-16 11:11:54.663604756 +0200 +@@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2020-06-01 14:12+0200\n" --"PO-Revision-Date: 2019-01-15 11:26+0000\n" --"Last-Translator: Copied by Zanata \n" -+"POT-Creation-Date: 2020-07-09 17:35+0200\n" -+"PO-Revision-Date: 2019-08-30 10:56-0400\n" -+"Last-Translator: Ludek Janda \n" +-"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"POT-Creation-Date: 2021-06-21 11:51+0200\n" + "PO-Revision-Date: 2019-08-30 10:56-0400\n" + "Last-Translator: Ludek Janda \n" "Language-Team: \n" - "Language: zh_TW\n" - "MIME-Version: 1.0\n" -@@ -15,7 +14,7 @@ +@@ -14,46 +14,70 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../org_fedora_oscap/common.py:326 ++#, python-brace-format ++msgid "Error extracting archive as a zipfile: {exc}" ++msgstr "" ++ ++#: ../org_fedora_oscap/content_discovery.py:167 ++#, fuzzy, python-brace-format ++#| msgid "The integrity check of the content failed. Cannot use the content." ++msgid "" ++"Integrity check of the content failed - {hash_obj.name} hash didn't match" ++msgstr "內容的完整性檢查失敗。無法使用內容。" ++ ++#: ../org_fedora_oscap/data_fetch.py:117 ++msgid "Network connection needed to fetch data." ++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 "" ++ ++#: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format msgid "" "{0} must be on a separate partition or logical volume and has to be created " -@@ -24,82 +23,90 @@ - msgstr "{0} 必須位於單獨的分區或邏輯卷上，並且必須在分區佈局中創建，然後才能使用安全配置文件進行安裝" + "in the partitioning layout before installation can occur with a security " + "profile" +-msgstr "{0} 必須位於單獨的分區或邏輯卷上，並且必須在分區佈局中創建，然後才能使用安全配置文件進行安裝" ++msgstr "" ++"{0} 必須位於單獨的分區或邏輯卷上，並且必須在分區佈局中創建，然後才能使用安全" ++"配置文件進行安裝" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 +-#: ../org_fedora_oscap/rule_handling.py:420 ++#: ../org_fedora_oscap/rule_handling.py:445 #, 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:520 -+#: ../org_fedora_oscap/rule_handling.py:529 +-#: ../org_fedora_oscap/rule_handling.py:529 ++#: ../org_fedora_oscap/rule_handling.py:554 #, python-format msgid "make sure to create password with minimal length of %d characters" msgstr "確保以最小的長度創建密碼 %d 人物" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 +-#: ../org_fedora_oscap/rule_handling.py:536 ++#: ../org_fedora_oscap/rule_handling.py:561 msgid "cannot check root password length (password is crypted)" msgstr "無法檢查root密碼長度（密碼被加密）" #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 +-#: ../org_fedora_oscap/rule_handling.py:542 ++#: ../org_fedora_oscap/rule_handling.py:567 #, 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:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:660 -+#: ../org_fedora_oscap/rule_handling.py:675 +-#: ../org_fedora_oscap/rule_handling.py:660 +-#: ../org_fedora_oscap/rule_handling.py:675 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:700 #, python-format msgid "package '%s' has been added to the list of to be installed packages" msgstr "包'%s'已添加到要安裝的軟件包列表中" --#: ../org_fedora_oscap/rule_handling.py:661 --#: ../org_fedora_oscap/rule_handling.py:676 -+#: ../org_fedora_oscap/rule_handling.py:685 -+#, 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 "" -+ -+#: ../org_fedora_oscap/rule_handling.py:692 -+#: ../org_fedora_oscap/rule_handling.py:707 +-#: ../org_fedora_oscap/rule_handling.py:685 ++#: ../org_fedora_oscap/rule_handling.py:710 + #, python-brace-format + msgid "" + "package '{package}' has been added to the list of excluded packages, but it " +@@ -61,169 +85,186 @@ + "installation." + msgstr "" + +-#: ../org_fedora_oscap/rule_handling.py:692 +-#: ../org_fedora_oscap/rule_handling.py:707 ++#: ../org_fedora_oscap/rule_handling.py:717 ++#: ../org_fedora_oscap/rule_handling.py:732 #, python-format msgid "package '%s' has been added to the list of excluded packages" msgstr "包'%s'已添加到已排除的包列表中" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 +-#: ../org_fedora_oscap/rule_handling.py:808 ++#: ../org_fedora_oscap/rule_handling.py:833 msgid "Kdump will be disabled on startup" msgstr "Kdump將在啟動時被禁用" --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 +-#: ../org_fedora_oscap/rule_handling.py:810 ++#: ../org_fedora_oscap/rule_handling.py:835 msgid "Kdump will be enabled on startup" msgstr "Kdump將在啟動時啟用" --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 +-#: ../org_fedora_oscap/rule_handling.py:963 ++#: ../org_fedora_oscap/rule_handling.py:988 msgid "Firewall will be disabled on startup" msgstr "防火牆將在啟動時禁用" --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 +-#: ../org_fedora_oscap/rule_handling.py:970 ++#: ../org_fedora_oscap/rule_handling.py:995 msgid "Firewall will be enabled on startup" msgstr "防火牆將在啟動時啟用" --#: ../org_fedora_oscap/rule_handling.py:947 --#: ../org_fedora_oscap/rule_handling.py:986 -+#: ../org_fedora_oscap/rule_handling.py:978 -+#: ../org_fedora_oscap/rule_handling.py:1017 +-#: ../org_fedora_oscap/rule_handling.py:978 +-#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../org_fedora_oscap/rule_handling.py:1042 #, 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:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../org_fedora_oscap/rule_handling.py:985 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../org_fedora_oscap/rule_handling.py:985 +-#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1010 ++#: ../org_fedora_oscap/rule_handling.py:1055 #, 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:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../org_fedora_oscap/rule_handling.py:992 -+#: ../org_fedora_oscap/rule_handling.py:1043 +-#: ../org_fedora_oscap/rule_handling.py:992 +-#: ../org_fedora_oscap/rule_handling.py:1043 ++#: ../org_fedora_oscap/rule_handling.py:1017 ++#: ../org_fedora_oscap/rule_handling.py:1068 #, 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:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../org_fedora_oscap/rule_handling.py:1055 -+#: ../org_fedora_oscap/rule_handling.py:1070 +-#: ../org_fedora_oscap/rule_handling.py:1055 +-#: ../org_fedora_oscap/rule_handling.py:1070 ++#: ../org_fedora_oscap/rule_handling.py:1080 ++#: ../org_fedora_oscap/rule_handling.py:1095 #, python-format msgid "" "service '%s' has been added to the list of services to be removed from the " -@@ -122,101 +129,101 @@ + "firewall" + msgstr "服務'%s'已被添加到要從防火牆中刪除的服務列表中" + +-#: ../org_fedora_oscap/ks/oscap.py:418 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "獲取和加載安全內容時出錯：%s安裝應該中止。你想繼續嗎？" ++#: ../org_fedora_oscap/ks/oscap.py:376 ++msgid "The installation should be aborted." ++msgstr "" + +-#: ../org_fedora_oscap/ks/oscap.py:447 +-msgid "" +-"The integrity check of the security content failed.\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-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." ++msgid "The integrity check of the security content failed." ++msgstr "內容的完整性檢查失敗。無法使用內容。" ++ ++#: ../org_fedora_oscap/ks/oscap.py:404 ++#, 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 ++msgid "There was an unexpected problem with the supplied content." ++msgstr "" ++ ++#: ../org_fedora_oscap/ks/oscap.py:462 ++#, fuzzy ++#| msgid "Misconfiguration detected" ++msgid "Wrong configuration detected!" ++msgstr "檢測到配置錯誤" #. title of the spoke (will be displayed on the hub) - #: ../org_fedora_oscap/gui/spokes/oscap.py:198 --msgid "_SECURITY POLICY" -+msgid "_Security Policy" +-#: ../org_fedora_oscap/gui/spokes/oscap.py:198 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" msgstr "安全政策（_S）" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:226 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:229 msgid "Not ready" msgstr "沒有準備好" --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:374 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:383 msgid "Fetching content data" msgstr "獲取內容數據" --#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1051 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:626 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 msgid "No profile selected" msgstr "沒有選擇個人資料" --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:646 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:631 msgid "No rules for the pre-installation phase" msgstr "沒有預安裝階段的規則" --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:798 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:782 msgid "Invalid content provided. Enter a different URL, please." msgstr "提供的內容無效。請輸入其他網址。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:806 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:790 msgid "Invalid or unsupported content URL, please enter a different one." msgstr "無效或不受支持的內容網址，請輸入其他網址。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:814 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:798 msgid "Failed to fetch content. Enter a different URL, please." msgstr "無法獲取內容。請輸入其他網址。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:822 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:806 msgid "" "Network error encountered when fetching data. Please check that network is " "setup and working." msgstr "獲取數據時遇到網絡錯誤。請檢查網絡是否已設置並正常運行。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:831 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:815 msgid "The integrity check of the content failed. Cannot use the content." msgstr "內容的完整性檢查失敗。無法使用內容。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:839 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:823 #, python-format msgid "Failed to extract content (%s). Enter a different URL, please." msgstr "無法提取內容（%s）。請輸入其他網址。" --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:857 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:840 #, python-format msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" +-"Profile with ID '%s' not defined in the content. Select a different profile," +-" please" ++"Profile with ID '%s' not defined in the content. Select a different profile, " ++"please" msgstr "帶ID的個人資料'%s'沒有在內容中定義。請選擇其他個人資料" --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:873 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:856 msgid "Not applying security policy" msgstr "不應用安全策略" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:904 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" msgstr " 或輸入以下數據流內容或存檔URL：" --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:908 tmp/oscap.glade.h:12 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:891 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:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1029 msgid "Error fetching and loading content" msgstr "獲取和加載內容時出錯" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1036 msgid "No content found" msgstr "找不到任何內容" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1047 msgid "Misconfiguration detected" msgstr "檢測到配置錯誤" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "Warnings appeared" msgstr "警告出現了" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 msgid "Everything okay" msgstr "一切都好" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 msgid "Invalid or unsupported URL" msgstr "網址無效或不受支持" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1149 tmp/oscap.glade.h:14 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:14 msgid "Fetching content..." msgstr "獲取內容......" -@@ -264,11 +271,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_使用SCAP安全指南（_U）" - --#: tmp/oscap.glade.h:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- +@@ -274,3 +315,14 @@ #: tmp/oscap.glade.h:13 msgid "_Fetch" msgstr "取（_F）" ++ ++#~ msgid "" ++#~ "There was an error fetching and loading the security content:\n" ++#~ "%s\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "獲取和加載安全內容時出錯：%s安裝應該中止。你想繼續嗎？" ++ ++#~ msgid "" ++#~ "The integrity check of the security content failed.\n" ++#~ "The installation should be aborted. Do you wish to continue anyway?" ++#~ msgstr "安全內容的完整性檢查失敗。安裝應該中止。你想繼續嗎？" diff --git a/SOURCES/oaa-1.2-unicode_issues_PR124.patch b/SOURCES/oaa-1.2-unicode_issues_PR124.patch deleted file mode 100644 index 9221ade..0000000 --- a/SOURCES/oaa-1.2-unicode_issues_PR124.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 316d1fdd46e962c2eca32dde8b6d391286bd3d28 Mon Sep 17 00:00:00 2001 -From: Masahiro Matsuya -Date: Fri, 7 Aug 2020 15:50:05 +0900 -Subject: [PATCH] avoiding UnicodeDecodeError in decode(). Output more errors - which starts with E: oscap - ---- - org_fedora_oscap/common.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/org_fedora_oscap/common.py b/org_fedora_oscap/common.py -index 9b4b7bf..45ce727 100644 ---- a/org_fedora_oscap/common.py -+++ b/org_fedora_oscap/common.py -@@ -136,8 +136,9 @@ def execute(self, ** kwargs): - - (stdout, stderr) = proc.communicate() - self.stdout = stdout.decode() -- self.stderr = stderr.decode() -+ self.stderr = stderr.decode(errors="replace") - self.messages = re.findall(r'OpenSCAP Error:.*', self.stderr) -+ self.messages = self.messages + re.findall(r'E: oscap:.*', self.stderr) - - self.returncode = proc.returncode - diff --git a/SOURCES/oaa-1.2_lang-streamline.patch b/SOURCES/oaa-1.2_lang-streamline.patch deleted file mode 100644 index 35e4e6e..0000000 --- a/SOURCES/oaa-1.2_lang-streamline.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 2646bb88746aa7b1abc715b40fa0a07a865d9576 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Wed, 17 Jun 2020 14:30:52 +0200 -Subject: [PATCH 1/3] Improve handling of languages. - -- fix the Makefile so translations are copied to the right directory in the image -- allow generation of update image with or without translations -- regenerate the create_update_image script with latest argbash ---- - Makefile | 6 ++- - create_update_image.sh | 86 ++++++++++++++++++++++++++++-------------- - 2 files changed, 63 insertions(+), 29 deletions(-) - -diff --git a/Makefile b/Makefile -index 2c2059c..dc8e9a0 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,6 +6,8 @@ ADDON = org_fedora_oscap - TESTS = tests \ - testing_files - -+DEFAULT_INSTALL_OF_PO_FILES ?= yes -+ - OSVERSION := $(shell grep -o " [0-9]\{1,\}" /etc/redhat-release | sed "s/ //g") - ifeq ($(OSVERSION),7) - PYVERSION = "" -@@ -37,7 +39,9 @@ NUM_PROCS = $$(getconf _NPROCESSORS_ONLN) - install: - mkdir -p $(DESTDIR)$(ADDONDIR) - cp -rv $(ADDON) $(DESTDIR)$(ADDONDIR) -+ifeq ($(DEFAULT_INSTALL_OF_PO_FILES),yes) - $(MAKE) install-po-files -+endif - - uninstall: - rm -rfv $(DESTDIR)$(ADDONDIR) -@@ -78,7 +82,7 @@ push-pot: potfile - zanata push $(ZANATA_PUSH_ARGS) - - install-po-files: -- $(MAKE) -C po install -+ $(MAKE) -C po install RPM_BUILD_ROOT=$(DESTDIR) - - test: - @echo "***Running pylint$(PYVERSION) checks***" -From 7434500bcd94c2c53d61c84a7364493372f7e053 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Wed, 17 Jun 2020 14:32:25 +0200 -Subject: [PATCH 2/3] Dont use capital letters for the spoke title. - ---- - org_fedora_oscap/gui/spokes/oscap.glade | 2 +- - po/oscap-anaconda-addon.pot | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.glade b/org_fedora_oscap/gui/spokes/oscap.glade -index e9e2fc0..e8516c0 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.glade -+++ b/org_fedora_oscap/gui/spokes/oscap.glade -@@ -37,7 +37,7 @@ - False - True - True -- SECURITY POLICY -+ Security Policy - - - - -From 00c3dd557881def88c2898fa6ced17dddfef5213 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Thu, 18 Jun 2020 15:12:40 +0200 -Subject: [PATCH 3/3] Changed URI back to URL in order not to mess with - translations. - -The PR #112 marked this string as translatable, and changed it in the process. -However, the string is already present elsewhere in the source code, so this move -messed things up for translators. - -This change reverts the URL->URI change, and leaves the GUI string "translatable", -as there is no way how to record the reason for this decision, so the situation doesn't repeat again. -As a result, it is now the job of the translation framework -to deal with the duplication gracefully. ---- - org_fedora_oscap/gui/spokes/oscap.glade | 2 +- - po/oscap-anaconda-addon.pot | 9 ++------- - 2 files changed, 3 insertions(+), 8 deletions(-) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.glade b/org_fedora_oscap/gui/spokes/oscap.glade -index e8516c0..1adcfcf 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.glade -+++ b/org_fedora_oscap/gui/spokes/oscap.glade -@@ -446,7 +446,7 @@ - - True - False -- No content found. Please enter data stream content or archive URI below: -+ No content found. Please enter data stream content or archive URL below: - True - 0 - diff --git a/SOURCES/oaa-1.2_spoke-window_PR122.patch b/SOURCES/oaa-1.2_spoke-window_PR122.patch deleted file mode 100644 index b61bcb9..0000000 --- a/SOURCES/oaa-1.2_spoke-window_PR122.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 943b2570c3196aec12a46d5b0e261f026ace0e86 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Thu, 9 Jul 2020 17:15:11 +0200 -Subject: [PATCH] Changed the spoke label back to uppercase. - -The spoke title which is defined in the Python code and visible in the hub -should have capitalization that respects the local language convention. -However, the much less visible spoke label that is defined in the glade file -should be uppercase, and so should be translations. ---- - org_fedora_oscap/gui/spokes/oscap.glade | 2 +- - org_fedora_oscap/gui/spokes/oscap.py | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.glade b/org_fedora_oscap/gui/spokes/oscap.glade -index 1adcfcf..1fd2664 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.glade -+++ b/org_fedora_oscap/gui/spokes/oscap.glade -@@ -37,7 +37,7 @@ - False - True - True -- Security Policy -+ SECURITY POLICY - - - -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index f21f7d3..b9fcd31 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -196,6 +196,9 @@ class OSCAPSpoke(NormalSpoke): - - # title of the spoke (will be displayed on the hub) - title = N_("_Security Policy") -+ # The string "SECURITY POLICY" in oscap.glade is meant to be uppercase, -+ # as it is displayed inside the spoke as the spoke label, -+ # and spoke labels are all uppercase by a convention. - - # methods defined by API and helper methods # - def __init__(self, data, storage, payload): diff --git a/SOURCES/oaa-1.2_warn-nfs-utils.patch b/SOURCES/oaa-1.2_warn-nfs-utils.patch deleted file mode 100644 index dbcdaf6..0000000 --- a/SOURCES/oaa-1.2_warn-nfs-utils.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9e514460c584666308967d611b26ea2927ea0535 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Thu, 18 Jun 2020 11:28:15 +0200 -Subject: [PATCH] Added nfs-utils as an essential package for GUI envs. - ---- - org_fedora_oscap/rule_handling.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/org_fedora_oscap/rule_handling.py b/org_fedora_oscap/rule_handling.py -index 3728f89..6a3a04e 100644 ---- a/org_fedora_oscap/rule_handling.py -+++ b/org_fedora_oscap/rule_handling.py -@@ -43,7 +43,10 @@ - ESSENTIAL_PACKAGES = { - "xorg-x11-server-common": { - "env": ["graphical-server-environment", "workstation-product-environment"], -- } -+ }, -+ "nfs-utils": { -+ "env": ["graphical-server-environment", "workstation-product-environment"], -+ }, - } - - log = logging.getLogger("anaconda") diff --git a/SOURCES/oaa-1.2_warn-xorg.patch b/SOURCES/oaa-1.2_warn-xorg.patch deleted file mode 100644 index b7bfeb3..0000000 --- a/SOURCES/oaa-1.2_warn-xorg.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 6c285154723f618675c3a216ce84b480d770c10d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Tue, 9 Jun 2020 16:56:32 +0200 -Subject: [PATCH 1/2] Address incompatible profiles and software selections. - -This change introduces a mechanism that allows to vet packages marked for removal. -Such package can now have a record in the ESSENTIAL_PACKAGES dict, -that define whether the package is essential => cant be removed -based on the environment and groups selected in the Software Selection Anaconda spoke. - -In case when one first selects the profile and then changes the Software Selection -to an incompatible setting, the Selection spoke will raise an error, as it already -tries to apply the blacklist with its environment/groups. ---- - org_fedora_oscap/rule_handling.py | 38 +++++++++++++++++++++++++++---- - 1 file changed, 33 insertions(+), 5 deletions(-) - -diff --git a/org_fedora_oscap/rule_handling.py b/org_fedora_oscap/rule_handling.py -index cd67822..3728f89 100644 ---- a/org_fedora_oscap/rule_handling.py -+++ b/org_fedora_oscap/rule_handling.py -@@ -40,6 +40,12 @@ - __all__ = ["RuleData"] - - -+ESSENTIAL_PACKAGES = { -+ "xorg-x11-server-common": { -+ "env": ["graphical-server-environment", "workstation-product-environment"], -+ } -+} -+ - log = logging.getLogger("anaconda") - - _ = common._ -@@ -627,6 +633,20 @@ def __str__(self): - - return ret - -+ def _package_is_essential(self, package_name, ksdata_packages): -+ if package_name not in ESSENTIAL_PACKAGES: -+ return False -+ if package_name in ksdata_packages.packageList: -+ return True -+ selected_install_env = ksdata_packages.environment -+ if selected_install_env in ESSENTIAL_PACKAGES[package_name].get("env"): -+ return True -+ selected_install_groups_names = {g.name for g in ksdata_packages.groupList} -+ for g in ESSENTIAL_PACKAGES[package_name].get("groups", []): -+ if g in selected_install_groups_names: -+ return True -+ return False -+ - def eval_rules(self, ksdata, storage, report_only=False): - """:see: RuleHandler.eval_rules""" - -@@ -655,13 +675,21 @@ def eval_rules(self, ksdata, storage, report_only=False): - common.MESSAGE_TYPE_INFO, msg)) - - # now do the same for the packages that should be excluded -- - # add messages for the already excluded packages - for pkg in self._removed_pkgs: -- msg = _("package '%s' has been added to the list of excluded " -- "packages" % pkg) -- messages.append(RuleMessage(self.__class__, -- common.MESSAGE_TYPE_INFO, msg)) -+ if self._package_is_essential(pkg, ksdata.packages): -+ 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)) -+ messages.append(RuleMessage(self.__class__, -+ common.MESSAGE_TYPE_FATAL, msg)) -+ else: -+ msg = _("package '%s' has been added to the list of excluded " -+ "packages" % pkg) -+ messages.append(RuleMessage(self.__class__, -+ common.MESSAGE_TYPE_INFO, msg)) - - # packages, that should be added - packages_to_remove = (pkg for pkg in self._remove_pkgs diff --git a/SOURCES/oscap-anaconda-addon-1.2-new_package_groups-PR_128.patch b/SOURCES/oscap-anaconda-addon-1.2-new_package_groups-PR_128.patch deleted file mode 100644 index 54f9ecf..0000000 --- a/SOURCES/oscap-anaconda-addon-1.2-new_package_groups-PR_128.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1de759e8bcf1caddddfdda59496473ed9b525365 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Wed, 4 Nov 2020 17:48:35 +0100 -Subject: [PATCH] Expanded group data to detect more package collisions. - -This should cover RHEL8 OSPP and CIS profiles. ---- - org_fedora_oscap/rule_handling.py | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/org_fedora_oscap/rule_handling.py b/org_fedora_oscap/rule_handling.py -index 6a3a04e..80d86c7 100644 ---- a/org_fedora_oscap/rule_handling.py -+++ b/org_fedora_oscap/rule_handling.py -@@ -40,12 +40,26 @@ - __all__ = ["RuleData"] - - -+# Mapping of packages to package environments and/or groups that depends on them -+# See also https://access.redhat.com/solutions/1201413 how to get group IDs. -+# on RHEL8, use e.g. grep -R "" /var/cache/dnf/* - ESSENTIAL_PACKAGES = { - "xorg-x11-server-common": { - "env": ["graphical-server-environment", "workstation-product-environment"], -+ "groups": ["workstation-product-environment"], - }, - "nfs-utils": { - "env": ["graphical-server-environment", "workstation-product-environment"], -+ "groups": ["workstation-product-environment"], -+ }, -+ "tftp": { -+ "groups": ["network-server"], -+ }, -+ "abrt": { -+ "groups": ["debugging"], -+ }, -+ "gssproxy": { -+ "groups": ["file-server"], - }, - } - -@@ -642,7 +656,7 @@ def _package_is_essential(self, package_name, ksdata_packages): - if package_name in ksdata_packages.packageList: - return True - selected_install_env = ksdata_packages.environment -- if selected_install_env in ESSENTIAL_PACKAGES[package_name].get("env"): -+ if selected_install_env in ESSENTIAL_PACKAGES[package_name].get("env", []): - return True - selected_install_groups_names = {g.name for g in ksdata_packages.groupList} - for g in ESSENTIAL_PACKAGES[package_name].get("groups", []): diff --git a/SOURCES/oscap-anaconda-addon-1.2.1-no_tmp_path-PR_161.patch b/SOURCES/oscap-anaconda-addon-1.2.1-no_tmp_path-PR_161.patch new file mode 100644 index 0000000..2eeedf0 --- /dev/null +++ b/SOURCES/oscap-anaconda-addon-1.2.1-no_tmp_path-PR_161.patch @@ -0,0 +1,32 @@ +From 56ee09bf171e0311e970b6bbd8c4c6d1114aca60 Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Tue, 29 Jun 2021 23:44:28 +0200 +Subject: [PATCH] Dont use the tmp_path fixture. + +The rhel8 pytest doesn't know it yet, +so it shouldn't be in the RHEL8 branch. +--- + tests/test_data_fetch.py | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/tests/test_data_fetch.py b/tests/test_data_fetch.py +index cfc56b9..3b18e1e 100644 +--- a/tests/test_data_fetch.py ++++ b/tests/test_data_fetch.py +@@ -61,9 +61,10 @@ def test_unsupported_url(): + assert not data_fetch.can_fetch_from("aaaaa") + + +-def test_fetch_local(tmp_path): +- source_path = pathlib.Path(__file__).absolute() +- dest_path = tmp_path / "dest" +- data_fetch.fetch_data("file://" + str(source_path), dest_path) +- with open(dest_path, "r") as copied_file: +- assert "This line is here and in the copied file as well" in copied_file.read() ++def test_fetch_local(): ++ with tempfile.NamedTemporaryFile() as f: ++ dest_path = pathlib.Path(f.name) ++ source_path = pathlib.Path(__file__).absolute() ++ data_fetch.fetch_data("file://" + str(source_path), dest_path) ++ with open(dest_path, "r") as copied_file: ++ assert "This line is here and in the copied file as well" in copied_file.read() diff --git a/SOURCES/oscap-anaconda-addon-1.2.1-various_fixes-PR_162.patch b/SOURCES/oscap-anaconda-addon-1.2.1-various_fixes-PR_162.patch new file mode 100644 index 0000000..7ad3d18 --- /dev/null +++ b/SOURCES/oscap-anaconda-addon-1.2.1-various_fixes-PR_162.patch @@ -0,0 +1,101 @@ +From 9d268437f092167f5afeb93e970eb197c696a866 Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Wed, 30 Jun 2021 21:29:24 +0200 +Subject: [PATCH 1/4] Fix shadowing of _ + +_, the established symbol for dummy return values, +conflicted with _, the establish symbol for gettext translations. +--- + org_fedora_oscap/ks/oscap.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/org_fedora_oscap/ks/oscap.py b/org_fedora_oscap/ks/oscap.py +index 2172293..b96b93b 100644 +--- a/org_fedora_oscap/ks/oscap.py ++++ b/org_fedora_oscap/ks/oscap.py +@@ -445,7 +445,7 @@ def setup(self, storage, ksdata, payload): + + try: + # just check that preferred content exists +- _ = self.content_bringer.get_preferred_content(content) ++ self.content_bringer.get_preferred_content(content) + except Exception as exc: + self._terminate(str(exc)) + return + +From 2e38bc81e925818b8985dc80a0004b94c1f9278e Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Wed, 30 Jun 2021 21:29:41 +0200 +Subject: [PATCH 2/4] Fix conversion of fatal messages to strings + +--- + org_fedora_oscap/ks/oscap.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/org_fedora_oscap/ks/oscap.py b/org_fedora_oscap/ks/oscap.py +index b96b93b..90e8dd4 100644 +--- a/org_fedora_oscap/ks/oscap.py ++++ b/org_fedora_oscap/ks/oscap.py +@@ -460,7 +460,7 @@ def setup(self, storage, ksdata, payload): + if message.type == common.MESSAGE_TYPE_FATAL] + if any(fatal_messages): + msg_lines = [_("Wrong configuration detected!")] +- msg_lines.extend(fatal_messages) ++ msg_lines.extend([m.text for m in fatal_messages]) + self._terminate("\n".join(msg_lines)) + return + + +From fc467d9699a3ede83a2117ca48fae8edb589f35b Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Wed, 30 Jun 2021 20:45:22 +0200 +Subject: [PATCH 3/4] Streamline the code + +Make get_preinst_content_path and get_raw_preinst_content_path +easier to compare. +--- + org_fedora_oscap/ks/oscap.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/org_fedora_oscap/ks/oscap.py b/org_fedora_oscap/ks/oscap.py +index 90e8dd4..d1b8c9e 100644 +--- a/org_fedora_oscap/ks/oscap.py ++++ b/org_fedora_oscap/ks/oscap.py +@@ -325,8 +325,7 @@ def preinst_content_path(self): + """Path to the pre-installation content file""" + + if self.content_type == "datastream": +- return utils.join_paths(common.INSTALLATION_CONTENT_DIR, +- self.content_name) ++ return self.raw_preinst_content_path + elif self.content_type == "scap-security-guide": + # SSG is not copied to the standard place + return self.content_path + +From ea8fc0ab6307a6b8381b18b26cb0c7ce3ff7f8b0 Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Wed, 30 Jun 2021 20:49:07 +0200 +Subject: [PATCH 4/4] Fix an f-string that references incorrect variable + +--- + org_fedora_oscap/content_discovery.py | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py +index 6393086..f6b4d27 100644 +--- a/org_fedora_oscap/content_discovery.py ++++ b/org_fedora_oscap/content_discovery.py +@@ -243,9 +243,10 @@ def get_preferred_content(self, content): + return preferred_content + + def get_preferred_tailoring(self, content): +- if self._addon_data.tailoring_path: +- if self._addon_data.tailoring_path != str(content.tailoring.relative_to(content.root)): +- msg = f"Expected a tailoring {self.tailoring_path}, but it couldn't be found" ++ tailoring_path = self._addon_data.tailoring_path ++ if tailoring_path: ++ if tailoring_path != str(content.tailoring.relative_to(content.root)): ++ msg = f"Expected a tailoring {tailoring_path}, but it couldn't be found" + raise content_handling.ContentHandlingError(msg) + return content.tailoring + diff --git a/SPECS/oscap-anaconda-addon.spec b/SPECS/oscap-anaconda-addon.spec index 69eb708..1f58249 100644 --- a/SPECS/oscap-anaconda-addon.spec +++ b/SPECS/oscap-anaconda-addon.spec @@ -2,8 +2,8 @@ %global _default_patch_flags --no-backup-if-mismatch Name: oscap-anaconda-addon -Version: 1.1.1 -Release: 7%{?dist} +Version: 1.2.0 +Release: 2%{?dist} Summary: Anaconda addon integrating OpenSCAP to the installation process License: GPLv2+ @@ -19,12 +19,8 @@ Source0: %{name}-%{version}.tar.gz # Let the Patch1 be reserved for translations patches Patch1: lang.patch -Patch2: oaa-1.2_warn-xorg.patch -Patch3: oaa-1.2_warn-nfs-utils.patch -Patch4: oaa-1.2_lang-streamline.patch -Patch5: oaa-1.2_spoke-window_PR122.patch -Patch6: oaa-1.2-unicode_issues_PR124.patch -Patch7: oscap-anaconda-addon-1.2-new_package_groups-PR_128.patch +Patch2: oscap-anaconda-addon-1.2.1-no_tmp_path-PR_161.patch +Patch3: oscap-anaconda-addon-1.2.1-various_fixes-PR_162.patch BuildArch: noarch BuildRequires: make @@ -50,10 +46,6 @@ content. %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 # As patches may translates the strings that are updated by later patches, # Patch1 needs to be aplied last. @@ -79,6 +71,14 @@ make install DESTDIR=%{buildroot} %doc COPYING ChangeLog README.md %changelog +* Fri Jul 16 2021 Matej Tyc - 1.2.0-2 +- Updated translations +- Resolves: rhbz#1938623 + +* Fri Jun 25 2021 Matej Tyc - 1.2.0-1 +- Rebase to the new upstream version. +- Resolves: rhbz#1691305 + * Mon Feb 15 2021 Matej Tyc - 1.1.1-7 - Updated translations.