From 93f96bcdac3b615e753b5896f7524fa0b66719c2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 6 Oct 2021 04:22:19 -0400 Subject: [PATCH] import oscap-anaconda-addon-1.2.1-4.el8 --- .gitignore | 2 +- .oscap-anaconda-addon.metadata | 2 +- SOURCES/lang.patch | 6146 ++--------------- SOURCES/oaa-1.2-unicode_issues_PR124.patch | 25 - SOURCES/oaa-1.2_lang-streamline.patch | 101 - SOURCES/oaa-1.2_spoke-window_PR122.patch | 41 - SOURCES/oaa-1.2_warn-nfs-utils.patch | 25 - SOURCES/oaa-1.2_warn-xorg.patch | 82 - ...-addon-1.2-new_package_groups-PR_128.patch | 50 - ...nda-addon-1.2.2-content_ident-PR_167.patch | 39 + ...nda-addon-1.2.2-deep_archives-PR_168.patch | 51 + SPECS/oscap-anaconda-addon.spec | 45 +- 12 files changed, 526 insertions(+), 6083 deletions(-) delete mode 100644 SOURCES/oaa-1.2-unicode_issues_PR124.patch delete mode 100644 SOURCES/oaa-1.2_lang-streamline.patch delete mode 100644 SOURCES/oaa-1.2_spoke-window_PR122.patch delete mode 100644 SOURCES/oaa-1.2_warn-nfs-utils.patch delete mode 100644 SOURCES/oaa-1.2_warn-xorg.patch delete mode 100644 SOURCES/oscap-anaconda-addon-1.2-new_package_groups-PR_128.patch create mode 100644 SOURCES/oscap-anaconda-addon-1.2.2-content_ident-PR_167.patch create mode 100644 SOURCES/oscap-anaconda-addon-1.2.2-deep_archives-PR_168.patch diff --git a/.gitignore b/.gitignore index 8194750..84e9060 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/oscap-anaconda-addon-1.1.1.tar.gz +SOURCES/oscap-anaconda-addon-1.2.1.tar.gz diff --git a/.oscap-anaconda-addon.metadata b/.oscap-anaconda-addon.metadata index 72359c4..0ee0c6c 100644 --- a/.oscap-anaconda-addon.metadata +++ b/.oscap-anaconda-addon.metadata @@ -1 +1 @@ -789fbf8b6c8618619fb484a635c29d638202d015 SOURCES/oscap-anaconda-addon-1.1.1.tar.gz +9ddad97065dcdcaa475051ad576cd9f2e9a5a2cc SOURCES/oscap-anaconda-addon-1.2.1.tar.gz diff --git a/SOURCES/lang.patch b/SOURCES/lang.patch index 8723077..b5e76e3 100644 --- a/SOURCES/lang.patch +++ b/SOURCES/lang.patch @@ -1,2216 +1,133 @@ -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 "" - 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" - "Last-Translator: Robert Antoni Buj Gelonch \n" - "Language-Team: Catalan (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/ca/)\n" - "Language: ca\n" -@@ -21,7 +20,7 @@ - "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 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -30,7 +29,7 @@ - msgstr "" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -39,78 +38,86 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, 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 - 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 - #, 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 - #, 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 - #, 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 - msgid "Kdump will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - 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 - #, 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 - #, 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 - #, 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 - #, 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?" - 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?" - 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?" - - #. 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" -+msgstr "" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "No està llest" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - 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 - 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 - 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 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "" - "S'ha proporcionat un context no vàlid. Si us plau, introduïu un URL " - "diferent." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "" -+"L'URL del contingut no és vàlid o no està admès, si us plau, introduïu-ne un" -+" altre diferent." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 - 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 - 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." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" -+"Ha fallat la comprovació de la integritat del contingut. No es pot utilitzar" -+" el contingut." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 - #, 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 - #, python-format - msgid "" - "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" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 - 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 - 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 - 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 - msgid "Error fetching and loading content" --msgstr "" -+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 - 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 - 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 - 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 - msgid "Everything okay" - msgstr "Tot està bé" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - 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 - 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 "" -- - #: tmp/oscap.glade.h:13 - msgid "_Fetch" - msgstr "_Obté" -Binary files a/po/cs.mo and b/po/cs.mo differ -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 "" - 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" - "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" - --#: ../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 " -@@ -33,24 +36,24 @@ - "bezpečnostním profilem" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, 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 - #, 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 - 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 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -59,58 +62,68 @@ - "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 - #, 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 - #, 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 - 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 - 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 - 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 - 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 - #, 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 - #, 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 - #, 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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -138,40 +151,40 @@ - - #. 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í" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "Není připraven" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - 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 - 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 - 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 - 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 - 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 - 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 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -179,63 +192,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 - 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 - #, 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 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" - msgstr "Profil s ID '%s' není definován v datech. Vyberte prosím jiný profil" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 - 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 - msgid " or enter data stream content or archive URL below:" - msgstr "nebo zadejte URL data streamu, případně archivu:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../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 "" - "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 - 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 - 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 - 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 - msgid "Warnings appeared" - msgstr "Varování" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - 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 - 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 - 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 "" -- - #: tmp/oscap.glade.h:13 - msgid "_Fetch" - msgstr "_Načíst" -Binary files a/po/de.mo and b/po/de.mo differ -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 - 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" - "Last-Translator: Ludek Janda \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" - --#: ../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 " -@@ -27,7 +26,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 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -36,21 +35,21 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, 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 - 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 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -59,36 +58,44 @@ - "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 - #, 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 - #, 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 - 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 - 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 - 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 - 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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " -@@ -97,8 +104,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 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" -@@ -106,8 +113,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 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -115,8 +122,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 - #, 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" - - #. 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/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - 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 - 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 - 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 - 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 - 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 - 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 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -190,20 +197,20 @@ - "Beim Abrufen von Daten ist ein Netzwerkfehler aufgetreten. Bitte überprüfen " - "Sie, ob das Netzwerk eingerichtet ist und funktioniert." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - "Die Integritätsprüfung des Inhalts ist fehlgeschlagen. Der Inhalt kann nicht" - " verwendet werden." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 - #, 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 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," -@@ -212,48 +219,48 @@ - "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 - 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 - 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 - 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 - 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 - msgid "No content found" - msgstr "Kein Inhalt gefunden" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "Fehlkonfiguration erkannt" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "Warnungen erschienen" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "Alles okay" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - 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 - 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:12 --msgid "" --"No content found. Please enter data stream content or archive URI below:" --msgstr "" -- - #: tmp/oscap.glade.h:13 - msgid "_Fetch" - msgstr "_Fetch" -Binary files a/po/es.mo and b/po/es.mo differ -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 "" - 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" - "Language: es\n" -@@ -22,7 +23,7 @@ - "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 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -34,7 +35,7 @@ - "con un perfil de seguridad" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -43,20 +44,20 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, 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 - 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 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -65,36 +66,44 @@ - "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 - #, 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 - #, 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 - 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 - 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 - 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 - 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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " -@@ -103,16 +112,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 - #, 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 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -120,8 +129,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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -151,44 +160,44 @@ - - #. 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" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "No está listo" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - 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 - 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 - 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 - 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 - 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 - msgid "Failed to fetch content. Enter a different URL, please." - 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 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -196,19 +205,19 @@ - "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 - 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 - #, 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 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," -@@ -216,49 +225,49 @@ - 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 - 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 - 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:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../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 "" - "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 - 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 - 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 - 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 - msgid "Warnings appeared" - msgstr "Advertencias aparecieron" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "Todo está bien" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - 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 - 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 "" -- - #: 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 +--- a/po/fr.po 2021-07-30 15:17:14.000000000 +0200 ++++ b/po/fr.po 2021-08-20 16:33:20.757713431 +0200 +@@ -8,45 +8,47 @@ # Ludek Janda , 2018. #zanata # Ludek Janda , 2019. #zanata -+# Ludek Janda , 2020. #zanata - 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" - --#: ../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 " -@@ -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é" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -44,21 +44,21 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "" - "assurez-vous de créer un mot de passe d'une longueur minimale de %d " - "caractères" - --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 - msgid "cannot check root password length (password is crypted)" - msgstr "" - "impossible de vérifier la longueur du mot de passe de root (mot de passe " - "chiffré)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 - #, 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" - --#: ../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 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "le paquet « %s » a été ajouté à la liste des paquets à installer" - --#: ../org_fedora_oscap/rule_handling.py: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 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "le paquet « %s » a été ajouté à la liste des paquets à exclure" - --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 - msgid "Kdump will be disabled on startup" - msgstr "Kdump va être désactivé au démarrage" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "Kdump va être activé au démarrage" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - 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 - msgid "Firewall will be enabled on startup" - 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 - #, 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" - --#: ../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 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" - msgstr "port « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" - --#: ../org_fedora_oscap/rule_handling.py:961 --#: ../org_fedora_oscap/rule_handling.py:1012 -+#: ../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 "" - "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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -149,43 +160,43 @@ - - #. 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é" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "Pas prêt" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - msgid "Fetching content data" - 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 - msgid "No profile selected" - msgstr "Aucun profil sélectionné" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - msgid "No rules for the pre-installation phase" - msgstr "Aucune règle pour la phase de pré-installation" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Contenu fourni invalide. Merci de saisir une URL différente." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "" - "URL de contenu non prise en charge ou non valide, veuillez saisir une URL " - "différente." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "" - "Échec de la récupération du contenu. Merci de saisir une URL différente." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 - 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." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" - "Le contrôle d'intégrité du contenu a échoué. Impossible d'utiliser le " - "contenu." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "" - "Impossible d'extraire le contenu (%s). Merci de saisir une URL différente." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../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 "" - "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" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 - msgid "Not applying security policy" - 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 - 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 :" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../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 "" - "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 - msgid "Error fetching and loading content" - 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 - msgid "No content found" - msgstr "Contenu introuvable" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "Mauvaise configuration détectée" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "Des avertissements sont apparus" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "Tout est OK" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - msgid "Invalid or unsupported 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 - msgid "Fetching content..." - msgstr "Récupération du contenu..." - -@@ -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 "" -- - #: 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 "" - "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" - "MIME-Version: 1.0\n" -@@ -19,16 +22,19 @@ - "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 - #, 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" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -37,80 +43,95 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, python-format - msgid "make sure to create password with minimal length of %d characters" - msgstr "bizonyosodjon meg arról, hogy %d karakter hosszúságú jelszót ad meg" - --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 - msgid "cannot check root password length (password is crypted)" - msgstr "root jelszó hosszúsága nem ellenőrzhető (jelszó titkosított)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../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 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 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "'%s' csomag hozzáadásra került a telepítendő csomagok listájához" - --#: ../org_fedora_oscap/rule_handling.py: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 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "'%s' csomag hozzáadásra került az eltávolítandó csomagok listájához" - --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 - msgid "Kdump will be disabled on startup" --msgstr "" -+msgstr "A Kdump indításkor le lesz tiltva" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" --msgstr "" -+msgstr "A Kdump indításkor engedélyezve lesz" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" --msgstr "" -+msgstr "A tűzfal indításkor le lesz tiltva" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - msgid "Firewall will be enabled on startup" --msgstr "" -+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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " - "firewall" - msgstr "" -+"szolgáltatás \"%s\" lett hozzáadva a tűzfalhoz hozzáadandó szolgáltatások " -+"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 - #, 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" - --#: ../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 - #, 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" - --#: ../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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" - msgstr "" -+"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 -@@ -119,119 +140,131 @@ - "%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?" - - #: ../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 "" -+"A biztonsági tartalom integritásának ellenőrzése sikertelen.\n" -+"A telepítést meg kell szakítani. Szeretné folytatni?" - - #. 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" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "Nincs még kész" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - msgid "Fetching content data" - 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 - msgid "No profile selected" - msgstr "Nincs profil kiválasztva" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - msgid "No rules for the pre-installation phase" - msgstr "Nincsenek szabályok felállítva az előkészítési fázishoz" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "" - "Helytelen tartalom került megadásra. Kérem, adjon meg egy másik URL-t." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 - 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." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Tartalom letöltése sikertelen. Kérem, adjon meg másik URL-t." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 - 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ő." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 - msgid "The integrity check of the content failed. Cannot use the content." - msgstr "" -+"Nem sikerült a tartalom integritásának ellenőrzése. A tartalom nem " -+"használható." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "Tartalom kibontása sikertelen (%s). Kérem, adjon meg másik URL-t." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../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 "" -+"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 - msgid "Not applying security policy" --msgstr "" -+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 - msgid " or enter data stream content or archive URL below:" - 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 - msgid "" - "No content found. Please enter data stream content or archive URL below:" - msgstr "" - "Tartalom nem található. Kérem adjon meg egy adathalmazt, vagy archív URL-t " - "alább:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 - msgid "Error fetching and loading content" --msgstr "" -+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 - msgid "No content found" - msgstr "Tartalom nem található" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "Helytelen beállítások észlelve" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "Figyelmeztetések jelentek meg" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "Minden rendben" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - msgid "Invalid or unsupported URL" - 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 - 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" - --#: 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 "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 "" - "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" - "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" - --#: ../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 " -@@ -27,7 +28,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 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -36,20 +37,20 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, 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" - --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 - msgid "cannot check root password length (password is crypted)" - 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 - #, 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" - --#: ../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 - #, 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" - --#: ../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 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "pacchetto '%s'è stato aggiunto all'elenco dei pacchetti esclusi" - --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 - msgid "Kdump will be disabled on startup" - msgstr "Kdump sarà disabilitato all'avvio" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "Kdump sarà abilitato all'avvio" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - msgstr "Il firewall sarà disabilitato all'avvio" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - msgid "Firewall will be enabled on startup" - 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 - #, 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" - --#: ../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 - #, 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" - --#: ../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 - #, 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" - --#: ../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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -143,41 +152,41 @@ - - #. 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" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "Non pronto" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - msgid "Fetching content data" - 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 - msgid "No profile selected" - msgstr "Nessun profilo selezionato" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - msgid "No rules for the pre-installation phase" - 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 - msgid "Invalid content provided. Enter a different URL, please." - 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 - msgid "Invalid or unsupported content URL, please enter a different one." - 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 - msgid "Failed to fetch content. Enter a different URL, please." - 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 - 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." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 - 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." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 - #, 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." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 - #, 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" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 - msgid "Not applying security policy" - 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 - 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:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../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 "" - "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 - msgid "Error fetching and loading content" - 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 - msgid "No content found" - msgstr "Nessun contenuto trovato" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "Rilevata errata configurazione" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "Sono apparsi avvertimenti" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "Tutto ok" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - msgid "Invalid or unsupported 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 - msgid "Fetching content..." - msgstr "Recupero del contenuto ..." - -@@ -298,11 +307,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_Usare Guida alla sicurezza di 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 "_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 "" "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" + "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" ++"PO-Revision-Date: 2021-08-20 09:04+0000\n" ++"Last-Translator: Sundeep Anand \n" ++"Language-Team: French \n" + "Language: fr\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=2; plural=(n > 1);\n" +-"X-Generator: Zanata 4.6.2\n" ++"Plural-Forms: nplurals=2; plural=n > 1;\n" ++"X-Generator: Weblate 4.7.2\n" + + #: ../org_fedora_oscap/common.py:326 + #, python-brace-format + msgid "Error extracting archive as a zipfile: {exc}" +-msgstr "" ++msgstr "Erreur d'extraction de l'archive en tant que fichier zip : {exc}" + + #: ../org_fedora_oscap/content_discovery.py:167 +-#, fuzzy, python-brace-format +-#| msgid "The integrity check of the content failed. Cannot use the content." ++#, python-brace-format + msgid "" + "Integrity check of the content failed - {hash_obj.name} hash didn't match" + msgstr "" +-"Le contrôle d'intégrité du contenu a échoué. Impossible d'utiliser le " +-"contenu." ++"Le contrôle d'intégrité du contenu a échoué - le hachage de {hash_obj.name} " ++"ne correspond pas" + + #: ../org_fedora_oscap/data_fetch.py:117 + msgid "Network connection needed to fetch data." +-msgstr "" ++msgstr "Connexion réseau nécessaire pour récupérer les données." + + #: ../org_fedora_oscap/data_fetch.py:262 + #, python-brace-format + msgid "" + "Failed to fetch data - the request returned HTTP error code {return_code}" + msgstr "" ++"Impossible de récupérer les données - la demande a renvoyé un code d'erreur " ++"HTTP {return_code}" + + #: ../org_fedora_oscap/rule_handling.py:434 + #, python-brace-format +@@ -165,36 +167,30 @@ + + #: ../org_fedora_oscap/ks/oscap.py:376 + msgid "The installation should be aborted." +-msgstr "" ++msgstr "L'installation doit être interrompue." + + #: ../org_fedora_oscap/ks/oscap.py:377 + msgid "Do you wish to continue anyway?" +-msgstr "" ++msgstr "Voulez-vous malgré tout continuer ?" + + #: ../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." ++msgstr "La vérification de l'intégrité du contenu sécurité a échoué." + + #: ../org_fedora_oscap/ks/oscap.py:404 +-#, fuzzy +-#| msgid "Error fetching and loading content" + msgid "There was an error fetching and loading the security content:\n" +-msgstr "Erreur d'extraction et de chargement du contenu" ++msgstr "" ++"Une erreur s'est produite lors de la récupération et du chargement du " ++"contenu sécurité :\n" + + #: ../org_fedora_oscap/ks/oscap.py:409 + #: ../org_fedora_oscap/gui/spokes/oscap.py:774 + msgid "There was an unexpected problem with the supplied content." +-msgstr "" ++msgstr "Il y a eu un problème inattendu avec le contenu fourni." + + #: ../org_fedora_oscap/ks/oscap.py:462 +-#, fuzzy +-#| msgid "Misconfiguration detected" + msgid "Wrong configuration detected!" +-msgstr "Mauvaise configuration détectée" ++msgstr "Mauvaise configuration détectée !" + + #. title of the spoke (will be displayed on the hub) + #: ../org_fedora_oscap/gui/spokes/oscap.py:201 +diff -U3 -N -r a/po/ja.po b/po/ja.po +--- a/po/ja.po 2021-07-30 15:17:14.000000000 +0200 ++++ b/po/ja.po 2021-08-20 16:33:20.758713446 +0200 +@@ -1,6 +1,6 @@ +-# Ludek Janda , 2017. #zanata +-# Ludek Janda , 2018. #zanata +-# Ludek Janda , 2020. #zanata ++# Ludek Janda , 2017. #zanata, 2021. ++# Ludek Janda , 2018. #zanata, 2021. ++# Ludek Janda , 2020. #zanata, 2021. + # Sundeep Anand , 2021. + # simmon , 2021. + msgid "" +@@ -8,38 +8,37 @@ + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2021-06-21 11:51+0200\n" +-"PO-Revision-Date: 2021-04-07 16:02+0000\n" +-"Last-Translator: simmon \n" +-"Language-Team: Japanese \n" ++"PO-Revision-Date: 2021-08-20 09:04+0000\n" +"Last-Translator: Sundeep Anand \n" +"Language-Team: Japanese \n" @@ -2218,3560 +135,305 @@ diff -U3 -N -r a/po/ja.po b/po/ja.po "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=1; plural=0;\n" +-"X-Generator: Weblate 4.5.3\n" ++"X-Generator: Weblate 4.7.2\n" + + #: ../org_fedora_oscap/common.py:326 + #, python-brace-format + msgid "Error extracting archive as a zipfile: {exc}" +-msgstr "" ++msgstr "アーカイブを zip ファイルとして抽出する際にエラーが発生しました: {exc}" + + #: ../org_fedora_oscap/content_discovery.py:167 +-#, fuzzy, python-brace-format +-#| msgid "The integrity check of the content failed. Cannot use the content." ++#, python-brace-format + msgid "" + "Integrity check of the content failed - {hash_obj.name} hash didn't match" +-msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。" ++msgstr "コンテンツの整合性チェックに失敗しました。{hash_obj.name} ハッシュが一致しませんでした" + + #: ../org_fedora_oscap/data_fetch.py:117 + msgid "Network connection needed to fetch data." +-msgstr "" ++msgstr "データの取得に必要なネットワーク接続。" + + #: ../org_fedora_oscap/data_fetch.py:262 + #, python-brace-format + msgid "" + "Failed to fetch data - the request returned HTTP error code {return_code}" +-msgstr "" ++msgstr "データの取得に失敗しました。返された HTTP エラーコード {return_code}" + + #: ../org_fedora_oscap/rule_handling.py:434 + #, python-brace-format +@@ -152,39 +151,33 @@ + + #: ../org_fedora_oscap/ks/oscap.py:376 + msgid "The installation should be aborted." +-msgstr "" ++msgstr "インストールを中止する必要があります。" + + #: ../org_fedora_oscap/ks/oscap.py:377 + msgid "Do you wish to continue anyway?" +-msgstr "" ++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 "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。" ++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 "コンテンツの取得およびロードのエラー" ++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 "" ++msgstr "指定のコンテンツで予期しない問題が発生しました。" + + #: ../org_fedora_oscap/ks/oscap.py:462 +-#, fuzzy +-#| msgid "Misconfiguration detected" + msgid "Wrong configuration detected!" +-msgstr "設定ミスが検出されました" ++msgstr "設定が正しく検出されました！" + + #. title of the spoke (will be displayed on the hub) + #: ../org_fedora_oscap/gui/spokes/oscap.py:201 + msgid "_Security Policy" +-msgstr "セキュリティーポリシ" ++msgstr "セキュリティーポリシー(_S)" + + #. the first status provided + #: ../org_fedora_oscap/gui/spokes/oscap.py:229 +diff -U3 -N -r a/po/si.po b/po/si.po +--- a/po/si.po 2021-07-30 15:17:14.000000000 +0200 ++++ b/po/si.po 2021-08-20 16:33:20.758713446 +0200 +@@ -7,13 +7,16 @@ + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2021-06-21 11:51+0200\n" +-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +-"Last-Translator: Automatically generated\n" +-"Language-Team: none\n" ++"PO-Revision-Date: 2021-08-19 07:04+0000\n" ++"Last-Translator: Hela Basa \n" ++"Language-Team: Sinhala \n" + "Language: si\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=n > 1;\n" ++"X-Generator: Weblate 4.7.2\n" + + #: ../org_fedora_oscap/common.py:326 + #, python-brace-format +@@ -168,7 +171,7 @@ + #. the first status provided + #: ../org_fedora_oscap/gui/spokes/oscap.py:229 + msgid "Not ready" +-msgstr "" ++msgstr "සූදානම් නැත" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:383 + msgid "Fetching content data" +diff -U3 -N -r a/po/sv.po b/po/sv.po +--- a/po/sv.po 2021-07-30 15:17:14.000000000 +0200 ++++ b/po/sv.po 2021-08-20 16:33:20.758713446 +0200 +@@ -1,12 +1,12 @@ +-# Göran Uddeborg , 2019. #zanata, 2020. ++# Göran Uddeborg , 2019. #zanata, 2020, 2021. + # Luna Jernberg , 2021. + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2021-06-21 11:51+0200\n" +-"PO-Revision-Date: 2021-06-26 19:04+0000\n" +-"Last-Translator: Luna Jernberg \n" ++"PO-Revision-Date: 2021-08-07 20:04+0000\n" ++"Last-Translator: Göran Uddeborg \n" + "Language-Team: Swedish \n" + "Language: sv\n" +@@ -14,7 +14,7 @@ + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=n != 1;\n" +-"X-Generator: Weblate 4.7\n" ++"X-Generator: Weblate 4.7.2\n" + + #: ../org_fedora_oscap/common.py:326 + #, python-brace-format +@@ -22,13 +22,12 @@ + 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." ++#, python-brace-format + msgid "" + "Integrity check of the content failed - {hash_obj.name} hash didn't match" + msgstr "" +-"Integritetskontrollen av innehållet misslyckades. Kan inte använda " +-"innehållet." ++"Integritetskontrollen av innehållet misslyckades – {hash_obj.name}-hachen " ++"stämmer inte" + + #: ../org_fedora_oscap/data_fetch.py:117 + msgid "Network connection needed to fetch data." +@@ -142,7 +141,7 @@ + msgid "" + "trust '%s' has been added to the list of trusts to be added to the firewall" + msgstr "" +-"förtroendet ”%s” har lagts till till listan över förtoenden att läggas till " ++"förtroendet ”%s” har lagts till till listan över förtroenden att läggas till " + "i brandväggen" + + #: ../org_fedora_oscap/rule_handling.py:1080 +@@ -157,7 +156,7 @@ + + #: ../org_fedora_oscap/ks/oscap.py:376 + msgid "The installation should be aborted." +-msgstr "Installationen kommer att avbrytas." ++msgstr "Installationen bör avbrytas." + + #: ../org_fedora_oscap/ks/oscap.py:377 + msgid "Do you wish to continue anyway?" +@@ -169,7 +168,7 @@ + + #: ../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" ++msgstr "Det uppstod ett fel när säkerhetsinnehåll hämtades och laddades:\n" + + #: ../org_fedora_oscap/ks/oscap.py:409 + #: ../org_fedora_oscap/gui/spokes/oscap.py:774 +@@ -188,7 +187,7 @@ + #. the first status provided + #: ../org_fedora_oscap/gui/spokes/oscap.py:229 + msgid "Not ready" +-msgstr "Inte redo" ++msgstr "Inte klar" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:383 + msgid "Fetching content data" +diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po +--- a/po/zh_CN.po 2021-07-30 15:17:14.000000000 +0200 ++++ b/po/zh_CN.po 2021-08-20 16:33:20.758713446 +0200 +@@ -1,41 +1,42 @@ +-# Ludek Janda , 2018. #zanata +-# Ludek Janda , 2020. #zanata ++# Ludek Janda , 2018. #zanata, 2021. ++# Ludek Janda , 2020. #zanata, 2021. ++# Sundeep Anand , 2021. + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2021-06-21 11:51+0200\n" +-"PO-Revision-Date: 2020-06-26 04:26-0400\n" +-"Last-Translator: Copied by Zanata \n" +-"Language-Team: Chinese (Simplified)\n" ++"PO-Revision-Date: 2021-08-20 09:04+0000\n" ++"Last-Translator: Sundeep Anand \n" ++"Language-Team: Chinese (Simplified) \n" + "Language: zh_CN\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: Zanata 4.6.2\n" +"Plural-Forms: nplurals=1; plural=0;\n" -+"X-Generator: Weblate 4.4.2\n" ++"X-Generator: Weblate 4.7.2\n" --#: ../org_fedora_oscap/rule_handling.py:400 -+#: ../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 "" ++msgstr "解压 zip 文件时出错： {exc}" + + #: ../org_fedora_oscap/content_discovery.py:167 +-#, fuzzy, python-brace-format +-#| msgid "The integrity check of the content failed. Cannot use the content." ++#, python-brace-format + msgid "" + "Integrity check of the content failed - {hash_obj.name} hash didn't match" +-msgstr "内容的完整性检查失败。不能使用这个内容。" ++msgstr "内容完整性检查失败 - {hash_obj.name} 哈希值不匹配" + + #: ../org_fedora_oscap/data_fetch.py:117 + msgid "Network connection needed to fetch data." +-msgstr "" ++msgstr "获取数据所需的网络连接。" + + #: ../org_fedora_oscap/data_fetch.py:262 #, python-brace-format msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -27,82 +29,92 @@ - "は、別のパーティションもしくは論理ボリューム上になければなりません。また、セキュリティープロファイルがインストールされる前にパーティションレイアウトに作成されなければなりません" + "Failed to fetch data - the request returned HTTP error code {return_code}" +-msgstr "" ++msgstr "获取数据失败 - 请求返回 HTTP 错误代码 {return_code}" - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" - msgstr "マウントオプション '%(mount_option)s' が、マウントポイント %(mount_point)s に追加されました" + #: ../org_fedora_oscap/rule_handling.py:434 + #, python-brace-format +@@ -142,34 +143,28 @@ - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, python-format - msgid "make sure to create password with minimal length of %d characters" --msgstr "%d 文字以上のパスワードを作成してください。" -+msgstr "%d 文字以上のパスワードを作成してください" + #: ../org_fedora_oscap/ks/oscap.py:376 + msgid "The installation should be aborted." +-msgstr "" ++msgstr "安装应终止。" --#: ../org_fedora_oscap/rule_handling.py:527 -+#: ../org_fedora_oscap/rule_handling.py:536 - msgid "cannot check root password length (password is crypted)" - msgstr "root パスワードの長さを確認できません (パスワードは暗号化済み)" + #: ../org_fedora_oscap/ks/oscap.py:377 + msgid "Do you wish to continue anyway?" +-msgstr "" ++msgstr "您是否希望继续？" - #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../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 のパスワードが短すぎます。%d 文字以上にする必要があります。" -+msgstr "root のパスワードが短すぎます。%d 文字以上にする必要があります" + #: ../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 "内容的完整性检查失败。不能使用这个内容。" ++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 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "パッケージ '%s' が、インストール予定パッケージ一覧に追加されました" + #: ../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 "获取并加载内容错误" ++msgstr "获取并载入安全内容时出错：\n" --#: ../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 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "パッケージ '%s' が、除外パッケージ一覧に追加されました" + #: ../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 "" ++msgstr "提供的内容出现意外问题。" --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 - msgid "Kdump will be disabled on startup" - msgstr "Kdump は起動時に無効になります" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "Kdump は起動時に有効になります" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - msgstr "ファイアウォールは起動時に無効になります" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - 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 - #, 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 - #, 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 - #, 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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -130,101 +142,101 @@ + #: ../org_fedora_oscap/ks/oscap.py:462 +-#, fuzzy +-#| msgid "Misconfiguration detected" + msgid "Wrong configuration detected!" +-msgstr "发现错误配置" ++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" - msgstr "セキュリティーポリシー(_S)" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "準備ができていません" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - 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 - msgid "No profile selected" - msgstr "選択されたプロファイルはありません" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - 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 - 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 - 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 - 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 - 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 - 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 - #, 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 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" --msgstr "コンテンツで ID が '%s' のプロファイルが定義されていません。別のプロファイルを選択してください。" -+msgstr "コンテンツで ID が '%s' のプロファイルが定義されていません。別のプロファイルを選択してください" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 - msgid "Not applying security policy" - msgstr "セキュリティーポリシーを適用しない" - - #. TRANSLATORS: the other choice if SCAP Security Guide is also + #: ../org_fedora_oscap/gui/spokes/oscap.py:201 +@@ -236,7 +231,7 @@ #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:899 -+#: ../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: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:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 - msgid "Error fetching and loading content" - msgstr "コンテンツの取得およびロードのエラー" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 - msgid "No content found" - msgstr "コンテンツが見つかりませんでした" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "設定ミスが検出されました" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "警告が表示されました" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "すべて OK" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - 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 - 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)" - --#: 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 "取得(_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 "" - "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" - --#: ../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 " - "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 - #, 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:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, 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 - 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 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " - "required" --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 - #, 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 "" -+"패키지 '{package}'가 제외된 패키지 목록에 추가되었지만 설치를 중단하지 않고 현재 소프트웨어 선택에서 제거할 수 없습니다." -+ -+#: ../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 "패키지 '%s'이/가 제외된 패키지 목록에 추가되었습니다. " -+msgstr "패키지 '%s'이/가 제외된 패키지 목록에 추가되었습니다" - --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 - msgid "Kdump will be disabled on startup" --msgstr "시작시 Kdump가 비활성화됩니다. " -+msgstr "시작시 Kdump가 비활성화됩니다" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" --msgstr "시작시 Kdump가 활성화됩니다. " -+msgstr "시작시 Kdump가 활성화됩니다" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" --msgstr "시작시 방화벽이 비활성화됩니다. " -+msgstr "시작시 방화벽이 비활성화됩니다" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - 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 - #, 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 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" --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 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" --msgstr "트러스트 '%s'이/가 방화벽에 추가할 트러스트 목록에 추가되었습니다. " -+msgstr "트러스트 '%s'이/가 방화벽에 추가할 트러스트 목록에 추가되었습니다" - --#: ../org_fedora_oscap/rule_handling.py:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../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 "서비스 '%s'이/가 방화벽에서 제거할 서비스 목록에 추가되었습니다. " -+msgstr "서비스 '%s'이/가 방화벽에서 제거할 서비스 목록에 추가되었습니다" - - #: ../org_fedora_oscap/ks/oscap.py:418 - #, python-format -@@ -126,101 +136,101 @@ - - #. 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)" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" --msgstr "준비되어 있지 않습니다 " -+msgstr "준비되어 있지 않습니다" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - 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 - msgid "No profile selected" --msgstr "프로파일이 선택되지 않았습니다 " -+msgstr "프로파일이 선택되지 않았습니다" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - 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 - 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 - msgid "Invalid or unsupported content URL, please enter a different one." --msgstr "유효하지 않거나 지원되지 않는 컨텐츠 URL입니다. 다른 URL을 입력하십시오. " -+msgstr "유효하지 않거나 지원되지 않는 컨텐츠 URL입니다. 다른 URL을 입력하십시오." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 - 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 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." --msgstr "컨텐츠를 가져오는 중 네트워크 오류가 발생했습니다. 네트워크가 제대로 작동하는지 확인하십시오. " -+msgstr "컨텐츠를 가져오는 중 네트워크 오류가 발생했습니다. 네트워크가 제대로 작동하는지 확인하십시오." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 - msgid "The integrity check of the content failed. Cannot use the content." --msgstr "컨텐츠 무결성 검사에 실패했습니다. 컨텐츠를 사용할 수 없습니다. " -+msgstr "컨텐츠 무결성 검사에 실패했습니다. 컨텐츠를 사용할 수 없습니다." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 - #, 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 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" --msgstr "ID '%s'이/가 프로파일에 정의되어 있지 않습니다. 다른 프로파일을 선택하십시오. " -+msgstr "ID '%s'이/가 프로파일에 정의되어 있지 않습니다. 다른 프로파일을 선택하십시오" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 - 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 - msgid " or enter data stream content or archive URL below:" --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 - msgid "" - "No content found. Please enter data stream content or archive URL below:" --msgstr "내용이 없습니다. 데이터 스트림 컨텐츠를 입력하거나 또는 다음 URL을 아카이브하십시오." -+msgstr "내용이 없습니다. 데이터 스트림 컨텐츠를 입력하거나 또는 다음 URL을 아카이브하십시오:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 - msgid "Error fetching and loading content" --msgstr "컨텐츠 오류 가져오기 및 로딩 오류 " -+msgstr "컨텐츠 오류 가져오기 및 로딩 오류" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 - msgid "No content found" --msgstr "컨텐츠를 찾을 수 없음 " -+msgstr "컨텐츠를 찾을 수 없음" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" --msgstr "설정 오류가 감지되었습니다 " -+msgstr "설정 오류가 감지되었습니다" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" --msgstr "경고가 표시되었습니다 " -+msgstr "경고가 표시되었습니다" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "모든 것이 정상입니다" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - 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 - 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)" - --#: 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 "가져오기(_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 "" - "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" - "Content-Transfer-Encoding: 8bit\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 "" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../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:520 -+#: ../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:527 -+#: ../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:533 -+#: ../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:637 --#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../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: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 - #, 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 - msgid "Kdump will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - 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 - #, 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 - #, 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 - #, 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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -128,97 +136,97 @@ - msgstr "" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:223 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:371 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - msgid "Fetching content data" - msgstr "" - --#: ../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 - msgid "No profile selected" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:643 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - msgid "No rules for the pre-installation phase" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:795 -+#: ../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:803 -+#: ../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:811 -+#: ../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:819 -+#: ../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:828 -+#: ../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:836 -+#: ../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:854 -+#: ../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:870 -+#: ../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:901 -+#: ../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:905 -+#: ../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:1043 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 - msgid "Error fetching and loading content" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 - msgid "No content found" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1061 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1145 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - msgid "Invalid or unsupported URL" - msgstr "" - --#: ../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 - msgid "Fetching content..." - msgstr "" - -@@ -266,11 +274,6 @@ - msgid "_Use SCAP Security Guide" - 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/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 "" - "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" - --#: ../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 " -@@ -47,7 +50,7 @@ - "za pomocą profilu bezpieczeństwa" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -56,17 +59,17 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, 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:527 -+#: ../org_fedora_oscap/rule_handling.py:536 - 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:533 -+#: ../org_fedora_oscap/rule_handling.py:542 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -74,63 +77,74 @@ - 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 - #, 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: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 - #, 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:777 -+#: ../org_fedora_oscap/rule_handling.py:808 - msgid "Kdump will be disabled on startup" - msgstr "Kdump będzie wyłączone podczas uruchamiania" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "Kdump będzie włączone podczas uruchamiania" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - msgstr "Zapora sieciowa będzie wyłączona podczas uruchamiania" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - msgid "Firewall will be enabled on startup" - msgstr "Zapora sieciowa będzie włączona podczas uruchamiania" - --#: ../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 - #, 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:954 --#: ../org_fedora_oscap/rule_handling.py:999 -+#: ../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 "dodano port „%s” do listy portów do dodania do zapory sieciowej" - --#: ../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 - #, 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:1024 --#: ../org_fedora_oscap/rule_handling.py:1039 -+#: ../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 "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" - - #: ../org_fedora_oscap/ks/oscap.py:418 - #, python-format -@@ -153,41 +167,41 @@ - - #. 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" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "Niegotowe" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - msgid "Fetching content data" - msgstr "Pobieranie danych treści" - --#: ../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 - msgid "No profile selected" - msgstr "Nie wybrano profilu" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - msgid "No rules for the pre-installation phase" - msgstr "Brak reguł dla fazy przedinstalacyjnej" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 - 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:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 - 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 - 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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 - 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." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 - 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 - #, 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:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 - #, 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" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 - msgid "Not applying security policy" --msgstr "Bez zastosowywania polityki bezpieczeństwa" -+msgstr "Bez zastosowywania zasad bezpieczeństwa" - - #. 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 - 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 - 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 - msgid "Error fetching and loading content" - msgstr "Błąd podczas pobierania i wczytywania treści" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 - msgid "No content found" - msgstr "Nie odnaleziono treści" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "Wykryto błędną konfigurację" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "Pojawiły się ostrzeżenia" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "Wszystko jest w porządku" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - msgid "Invalid or unsupported URL" - msgstr "Nieprawidłowy lub nieobsługiwany adres 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 - 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" - --#: 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 "" - 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" - "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" - "X-Generator: Zanata 4.6.2\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 " -@@ -34,7 +33,7 @@ - " um perfil de segurança" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -43,20 +42,20 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, 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 - msgid "cannot check root password length (password is crypted)" - msgstr "" - "Não é possível verificar o comprimento da senha do root (senha " - "criptografada)" - - #. too short --#: ../org_fedora_oscap/rule_handling.py:533 -+#: ../org_fedora_oscap/rule_handling.py:542 - #, 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" - --#: ../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 - #, python-format - msgid "package '%s' has been added to the list of to be installed packages" - msgstr "pacote '%s' foi adicionado à lista de pacotes a serem instalados" - --#: ../org_fedora_oscap/rule_handling.py: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 - #, python-format - msgid "package '%s' has been added to the list of excluded packages" - msgstr "pacote '%s' foi adicionado a lista de pacotes a serem excluídos" - --#: ../org_fedora_oscap/rule_handling.py:777 -+#: ../org_fedora_oscap/rule_handling.py:808 - msgid "Kdump will be disabled on startup" - msgstr "O Kdump será desativado na inicialização" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "O Kdump será ativado na inicialização" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - msgstr "Firewall será desativado na inicialização" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - msgid "Firewall will be enabled on startup" - 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 - #, 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 - #, 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 - #, 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" - --#: ../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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -150,41 +157,41 @@ - - #. 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 " - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "Ainda não esta pronto" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - msgid "Fetching content data" - msgstr "Buscando 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 - msgid "No profile selected" - msgstr "Nenhum perfil selecionado" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - msgid "No rules for the pre-installation phase" - msgstr "Não há regras para a fase de pré-instalação" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:793 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:798 - msgid "Invalid content provided. Enter a different URL, please." - msgstr "Conteúdo fornecido é inválido. Digite uma URL diferente, por favor." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:801 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:806 - 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:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 - msgid "Failed to fetch content. Enter a different URL, please." - msgstr "Falha ao buscar conteúdo. Digite uma URL diferente, por favor." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:822 - 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." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:831 - 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 - #, python-format - msgid "Failed to extract content (%s). Enter a different URL, please." - msgstr "" - "Falha ao extrair o conteúdo (%s). Digite uma URL diferente, por favor." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:852 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:857 - #, 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" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:873 - msgid "Not applying security policy" - 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:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 - msgid " or enter data stream content or archive URL below:" - msgstr "ou inserir conteúdo de fluxo de dados ou arquivo de URL abaixo:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../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 "" - "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:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 - msgid "Error fetching and loading content" - msgstr "Erro ao buscar e carregar o conteúdo" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 - msgid "No content found" - msgstr "Nenhum conteúdo encontrado" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "Misconfiguration detectado" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "Advertências surgidas" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "Tudo bem" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - msgid "Invalid or unsupported URL" - msgstr "URL inválida ou não suportada" - --#: ../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 "Buscando conteúdo..." - -@@ -302,11 +309,6 @@ - msgid "_Use SCAP Security Guide" - msgstr "_Use SCAP Segurança Guia" - --#: 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 "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 "" - "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" - --#: ../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 " -@@ -23,87 +23,90 @@ - msgstr "" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, 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 - #, 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 - 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 - #, 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 - #, 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 - #, 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 - msgid "Kdump will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - 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 - #, 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 - #, 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 - #, 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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -126,101 +129,101 @@ - - #. 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 "" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - msgid "Fetching content data" --msgstr "Obter dados de conteúdo" -+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 - msgid "No profile selected" - msgstr "Nenhum perfil selecionado" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - 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 - 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 - 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 - 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 - 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 - 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 - #, 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 - #, 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:868 -+#: ../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:899 -+#: ../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:903 -+#: ../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:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 - msgid "Error fetching and loading content" --msgstr "" -+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 - msgid "No content found" - msgstr "Nenhum conteúdo encontrado" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "Detetada má configuração" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "Está tudo bem" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - 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 "" - 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" - "X-Generator: Zanata 4.6.2\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 " -@@ -27,7 +26,7 @@ - "безопасности" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -36,17 +35,17 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, 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 - 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 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " -@@ -55,36 +54,44 @@ - "пароль 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 - #, 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 - #, 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 - msgid "Kdump will be disabled on startup" - msgstr "Kdump будет отключен при запуске" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "Kdump будет включен при запуске" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - msgstr "Брандмауэр будет отключен при запуске" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - 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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be added to the " -@@ -93,16 +100,16 @@ - "оказание услуг '%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 - #, 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 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -110,8 +117,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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -140,59 +147,59 @@ - - #. 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 "_Политика безопасности" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "Не готов" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - 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 - msgid "No profile selected" - msgstr "Не выбран профиль" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - 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 - 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 - msgid "Invalid or unsupported content URL, please enter a different one." - msgstr "Неверный или неподдерживаемый URL-адрес контента, введите другой." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:809 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:814 - 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 - 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 - 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 - #, 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 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," -@@ -201,48 +208,48 @@ - "Профиль с идентификатором '%s'не определено в контенте. Выберите другой " - "профиль, пожалуйста" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../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:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 - 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 - 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 - msgid "Error fetching and loading content" - msgstr "Ошибка получения и загрузки содержимого" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 - msgid "No content found" - msgstr "Не найдено ни одного контента" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "Обнаружено несоответствие" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "Появились предупреждения" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "Все в порядке" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - 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 - msgid "Fetching content..." - msgstr "Получение контента ..." - -@@ -290,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 "" -- - #: 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 @@ - 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" - --#: ../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 " -@@ -29,7 +29,7 @@ - msgstr "" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -38,75 +38,83 @@ - "%(mount_point)s" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, 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 - 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 - #, 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 - #, 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 - #, 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 - msgid "Kdump will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - msgstr "" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - 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 - #, 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 - #, 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 - #, 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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -129,103 +137,103 @@ - - #. 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 "" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "Није спремно" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - 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 - msgid "No profile selected" - msgstr "Није изабран профил" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - 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 - 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 - 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 - 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 - 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 - 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 - #, 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 - #, 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:868 -+#: ../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:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 - msgid " or enter data stream content or archive URL below:" - msgstr "или унесите садржајни или архивски URL за stream података испод:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+#: ../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 "" - "Садржај није пронађен. Молим унесите садржајни или архивски URL за stream " - "података:" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 - msgid "Error fetching and loading content" - msgstr "" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 - msgid "No content found" - msgstr "Садржај није пронађен" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "Погрешно подешавање откривено" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "Упозорења су се појавила" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "Све је у реду" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - 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 - msgid "Fetching content..." - msgstr "Преузимање садржаја..." - -@@ -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 "" -- - #: 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" -+ -+#: ../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" -+ -+#: ../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 "" -+"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." -+ -+#: ../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 -+msgid "" -+"Network error encountered when fetching data. Please check that network is " -+"setup and working." -+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." -+ -+#: ../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/gui/spokes/oscap.py:857 -+#, python-format -+msgid "" -+"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: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:" -+ -+#: 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 - #, python-brace-format - msgid "" - "{0} must be on a separate partition or logical volume and has to be created " -@@ -27,7 +29,7 @@ - "захисту" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, python-format - msgid "" - "mount option '%(mount_option)s' added for the mount point %(mount_point)s" -@@ -36,71 +38,79 @@ - "«%(mount_option)s»" - - #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:520 -+#: ../org_fedora_oscap/rule_handling.py:529 - #, 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 - 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 - #, python-format - msgid "" - "root password is too short, a longer one with at least %d characters is " - "required" --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 - #, 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 - #, 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 - msgid "Kdump will be disabled on startup" - msgstr "Kdump буде вимкнено при запуску" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "Kdump буде увімкнено при запуску" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - msgstr "Брандмауер буде вимкнено при запуску" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - 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 - #, 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 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" --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 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" -@@ -108,8 +118,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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -138,41 +148,41 @@ - - #. 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 "П_равила безпеки" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "Неготовий" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - 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 - msgid "No profile selected" - msgstr "Не вибрано жодного профілю" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - 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 - 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 - 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 - 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 - msgid "" - "Network error encountered when fetching data. Please check that network is " - "setup and working." -@@ -181,16 +191,16 @@ - "ласка, перевірте, чи правильно налаштовано з’єднання, та чи є воно " - "працездатним." - --#: ../org_fedora_oscap/gui/spokes/oscap.py:826 -+#: ../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:834 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:839 - #, 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 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," -@@ -199,47 +209,47 @@ - "Профіль з ідентифікатором «%s» у даних не визначено. Виберіть, будь ласка, " - "інший профіль" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../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:899 -+#: ../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:903 -+#: ../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:1041 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 - msgid "Error fetching and loading content" - msgstr "Помилка під час спроби отримання та завантаження даних" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 - msgid "No content found" - msgstr "Даних не знайдено" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "Виявлено помилки у налаштуваннях" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "Отримано попередження" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "Все гаразд" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - 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 - 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 "" -- - #: tmp/oscap.glade.h:13 - msgid "_Fetch" - msgstr "_Отримати" -Binary files a/po/zh_CN.mo and b/po/zh_CN.mo differ -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 "" - 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" - "Last-Translator: Copied by Zanata \n" - "Language-Team: Chinese (Simplified)\n" - "Language: zh_CN\n" -@@ -14,7 +15,7 @@ - "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 - #, 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} 必须在一个独立的分区或逻辑卷上，并需要在带有安全档案的安装进行前，在分区布局中创建" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, 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 - #, 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 - 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 - #, 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 - #, 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 - #, 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 - msgid "Kdump will be disabled on startup" - msgstr "Kdump 将在启动时被禁用" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "Kdump 将在启动时被启用" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - msgstr "防火墙将在启动时被禁用" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - 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 - #, 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 - #, 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 - #, 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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -126,101 +135,101 @@ - - #. 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）" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "未就绪" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - 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 - msgid "No profile selected" - msgstr "没有选择 profile" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - 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 - 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 - 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 - 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 - 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 - 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 - #, 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 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" - msgstr "ID 为 '%s' 的档案没有在内容中定义。请选择一个不同的档案" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../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:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 - 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 - 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 - msgid "Error fetching and loading content" - msgstr "获取并加载内容错误" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 - msgid "No content found" - msgstr "没有找到内容" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "发现错误配置" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "出现的警告" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "一切正常" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - 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 - 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 "" -- - #: tmp/oscap.glade.h:13 - msgid "_Fetch" - msgstr "获取(_F)" -Binary files a/po/zh_TW.mo and b/po/zh_TW.mo differ -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 "" - 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" - "Language-Team: \n" - "Language: zh_TW\n" - "MIME-Version: 1.0\n" -@@ -15,7 +14,7 @@ - "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 - #, 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} 必須位於單獨的分區或邏輯卷上，並且必須在分區佈局中創建，然後才能使用安全配置文件進行安裝" - - #. template for the message --#: ../org_fedora_oscap/rule_handling.py:411 -+#: ../org_fedora_oscap/rule_handling.py:420 - #, 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 - #, 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 - 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 - #, 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 - #, 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 - #, 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 - msgid "Kdump will be disabled on startup" - msgstr "Kdump將在啟動時被禁用" - --#: ../org_fedora_oscap/rule_handling.py:779 -+#: ../org_fedora_oscap/rule_handling.py:810 - msgid "Kdump will be enabled on startup" - msgstr "Kdump將在啟動時啟用" - --#: ../org_fedora_oscap/rule_handling.py:932 -+#: ../org_fedora_oscap/rule_handling.py:963 - msgid "Firewall will be disabled on startup" - msgstr "防火牆將在啟動時禁用" - --#: ../org_fedora_oscap/rule_handling.py:939 -+#: ../org_fedora_oscap/rule_handling.py:970 - 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 - #, 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 - #, 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 - #, 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 - #, python-format - msgid "" - "service '%s' has been added to the list of services to be removed from the " -@@ -122,101 +129,101 @@ - - #. 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）" - - #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:226 - msgid "Not ready" - msgstr "沒有準備好" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:374 - 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 - msgid "No profile selected" - msgstr "沒有選擇個人資料" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:646 - 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 - 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 - 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 - 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 - 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 - 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 - #, 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 - #, python-format - msgid "" - "Profile with ID '%s' not defined in the content. Select a different profile," - " please" - msgstr "帶ID的個人資料'%s'沒有在內容中定義。請選擇其他個人資料" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:868 -+#: ../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:899 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:904 - 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 - 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 - msgid "Error fetching and loading content" - msgstr "獲取和加載內容時出錯" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 - msgid "No content found" - msgstr "找不到任何內容" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 - msgid "Misconfiguration detected" - msgstr "檢測到配置錯誤" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 - msgid "Warnings appeared" - msgstr "警告出現了" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 - msgid "Everything okay" - msgstr "一切都好" - --#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 - 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 - 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 "" -- - #: tmp/oscap.glade.h:13 - msgid "_Fetch" - msgstr "取（_F）" 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.2-content_ident-PR_167.patch b/SOURCES/oscap-anaconda-addon-1.2.2-content_ident-PR_167.patch new file mode 100644 index 0000000..7e73e03 --- /dev/null +++ b/SOURCES/oscap-anaconda-addon-1.2.2-content_ident-PR_167.patch @@ -0,0 +1,39 @@ +From 1abc4e96638e819d3fbee74396b36a6ccaf0ab29 Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Tue, 3 Aug 2021 11:01:59 +0200 +Subject: [PATCH] Refactor content identification + +Don't use the multiprocessing pool - it sometimes creates probems during +its initialization: +https://bugzilla.redhat.com/show_bug.cgi?id=1989441 +--- + org_fedora_oscap/content_handling.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/org_fedora_oscap/content_handling.py b/org_fedora_oscap/content_handling.py +index f2af22f..65d5a28 100644 +--- a/org_fedora_oscap/content_handling.py ++++ b/org_fedora_oscap/content_handling.py +@@ -111,9 +111,8 @@ def parse_HTML_from_content(content): + + + def identify_files(fpaths): +- with multiprocessing.Pool(os.cpu_count()) as p: +- labels = p.map(get_doc_type, fpaths) +- return {path: label for (path, label) in zip(fpaths, labels)} ++ result = {path: get_doc_type(path) for path in fpaths} ++ return result + + + def get_doc_type(file_path): +@@ -131,7 +130,9 @@ def get_doc_type(file_path): + except UnicodeDecodeError: + # 'oscap info' supplied weird output, which happens when it tries + # to explain why it can't examine e.g. a JPG. +- return None ++ pass ++ except Exception as e: ++ log.warning(f"OSCAP addon: Unexpected error when looking at {file_path}: {str(e)}") + log.info("OSCAP addon: Identified {file_path} as {content_type}" + .format(file_path=file_path, content_type=content_type)) + return content_type diff --git a/SOURCES/oscap-anaconda-addon-1.2.2-deep_archives-PR_168.patch b/SOURCES/oscap-anaconda-addon-1.2.2-deep_archives-PR_168.patch new file mode 100644 index 0000000..d499c9c --- /dev/null +++ b/SOURCES/oscap-anaconda-addon-1.2.2-deep_archives-PR_168.patch @@ -0,0 +1,51 @@ +From 3377a914f4668af3d72216468ae192bc300890f9 Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Mon, 9 Aug 2021 15:45:58 +0200 +Subject: [PATCH 1/2] Fix archive handling in GUI installs + +GUI downloads an archive, so the ensuing installation doesn't have to. +However, the installation has to be able to discover files recovered +from the archive. +The fix makes sure that files are discovered also in subdirectories. +--- + org_fedora_oscap/content_discovery.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py +index f6b4d27..5fc7343 100644 +--- a/org_fedora_oscap/content_discovery.py ++++ b/org_fedora_oscap/content_discovery.py +@@ -196,7 +196,8 @@ def _gather_available_files(self, actually_fetched_content, dest_filename): + if not dest_filename: # using scap-security-guide + fpaths = [self.DEFAULT_SSG_DATA_STREAM_PATH] + else: # Using downloaded XCCDF/OVAL/DS/tailoring +- fpaths = glob(str(self.CONTENT_DOWNLOAD_LOCATION / "*.xml")) ++ fpaths = pathlib.Path(self.CONTENT_DOWNLOAD_LOCATION).rglob("*") ++ fpaths = [str(p) for p in fpaths if p.is_file()] + else: + dest_filename = pathlib.Path(dest_filename) + # RPM is an archive at this phase + +From 191df327e3e51f486fb655e97acac30222c264fa Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Mon, 9 Aug 2021 15:48:50 +0200 +Subject: [PATCH 2/2] Improve logging + +Logs written to log files can contain specific details. +--- + 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 d1b8c9e..65d74cf 100644 +--- a/org_fedora_oscap/ks/oscap.py ++++ b/org_fedora_oscap/ks/oscap.py +@@ -393,7 +393,7 @@ def _terminate(self, message): + time.sleep(100000) + + def _handle_error(self, exception): +- log.error("Failed to fetch and initialize SCAP content!") ++ log.error(f"Failed to fetch and initialize SCAP content: {str(exception)}") + + if isinstance(exception, ContentCheckError): + msg = _("The integrity check of the security content failed.") diff --git a/SPECS/oscap-anaconda-addon.spec b/SPECS/oscap-anaconda-addon.spec index 69eb708..1b96534 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.1 +Release: 4%{?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.2-content_ident-PR_167.patch +Patch3: oscap-anaconda-addon-1.2.2-deep_archives-PR_168.patch BuildArch: noarch BuildRequires: make @@ -48,16 +44,11 @@ content. %prep %setup -q -n %{name}-%{version} -%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. %patch1 -p1 +%patch2 -p1 +%patch3 -p1 # NOTE CONCERNING TRANSLATION PATCHES # When preparing translation patches, don't consider that some languages are unsupported - # we aim to include all applicable translation texts to the appropriate patch. @@ -79,6 +70,30 @@ make install DESTDIR=%{buildroot} %doc COPYING ChangeLog README.md %changelog +* Fri Aug 20 2021 Matej Tyc - 1.2.1-4 +- Updated translations + Resolves: rhbz#1962007 + +* Mon Aug 09 2021 Matej Tyc - 1.2.1-3 +- Fix handling of archives with directories in GUI installs +- Resolves: rhbz#1691305 + +* Tue Aug 03 2021 Matej Tyc - 1.2.1-2 +- Refactor content identification +- Resolves: rhbz#1989441 + +* Fri Jul 30 2021 Matej Tyc - 1.2.1-1 +- Rebase to the new upstream version. +- Resolves: rhbz#1691305 + +* 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.