diff --git a/.gitignore b/.gitignore index e2ae30b..8194750 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/oscap-anaconda-addon-1.0.tar.gz +SOURCES/oscap-anaconda-addon-1.1.1.tar.gz diff --git a/.oscap-anaconda-addon.metadata b/.oscap-anaconda-addon.metadata index a62afda..72359c4 100644 --- a/.oscap-anaconda-addon.metadata +++ b/.oscap-anaconda-addon.metadata @@ -1 +1 @@ -6edf7e4859de8e66837404c084405ea4318a319d SOURCES/oscap-anaconda-addon-1.0.tar.gz +789fbf8b6c8618619fb484a635c29d638202d015 SOURCES/oscap-anaconda-addon-1.1.1.tar.gz diff --git a/SOURCES/bootloader.patch b/SOURCES/bootloader.patch deleted file mode 100644 index 12a3f28..0000000 --- a/SOURCES/bootloader.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1e275a0da36595dd921732e0f60510171cdbe75c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Tue, 15 Jan 2019 19:16:44 +0100 -Subject: [PATCH] Updated code to comply to the Bootloader proxy API. - ---- - org_fedora_oscap/rule_handling.py | 4 ++-- - tests/test_rule_handling.py | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/org_fedora_oscap/rule_handling.py b/org_fedora_oscap/rule_handling.py -index 738465f..f3fd057 100644 ---- a/org_fedora_oscap/rule_handling.py -+++ b/org_fedora_oscap/rule_handling.py -@@ -716,9 +716,9 @@ def eval_rules(self, ksdata, storage, report_only=False): - - bootloader_proxy = STORAGE.get_proxy(BOOTLOADER) - -- if self._require_password and not bootloader_proxy.password_is_set: -+ if self._require_password and not bootloader_proxy.IsPasswordSet: - # TODO: Anaconda provides a way to set bootloader password: -- # bootloader_proxy.set_password(...) -+ # bootloader_proxy.SetEncryptedPassword(...) - # We don't support setting the bootloader password yet, - # but we shouldn't stop the installation, just because of that. - return [RuleMessage(self.__class__, common.MESSAGE_TYPE_WARNING, diff --git a/SOURCES/checksum.patch b/SOURCES/checksum.patch deleted file mode 100644 index 0952771..0000000 --- a/SOURCES/checksum.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fd1684358e212521abaf3ec7662aa97181868c0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Tue, 15 Jan 2019 18:19:28 +0100 -Subject: [PATCH] Fixed the checksum function to use forward-compatible rb - mode. - -On python3, there is a problem as contents of r-opened file is string, -but they are treated as bytes later. rb mode is fully python2-compatible. ---- - org_fedora_oscap/utils.py | 4 ++-- - tests/data/file | 1 + - tests/test_utils.py | 12 ++++++++++++ - 3 files changed, 15 insertions(+), 2 deletions(-) - create mode 100644 tests/data/file - -diff --git a/org_fedora_oscap/utils.py b/org_fedora_oscap/utils.py -index 6d5c157..3be8325 100644 ---- a/org_fedora_oscap/utils.py -+++ b/org_fedora_oscap/utils.py -@@ -175,8 +175,8 @@ def get_file_fingerprint(fpath, hash_obj): - - """ - -- with open(fpath, "r") as fobj: -- bsize = 4*1024 -+ with open(fpath, "rb") as fobj: -+ bsize = 4 * 1024 - # process file as 4 KB blocks - buf = fobj.read(bsize) - while buf: diff --git a/SOURCES/do_not_use_capitals_for_the_spoke_title.patch b/SOURCES/do_not_use_capitals_for_the_spoke_title.patch deleted file mode 100644 index 492779c..0000000 --- a/SOURCES/do_not_use_capitals_for_the_spoke_title.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2f97f43a4194263e47d4747e39c22b8287a659b3 Mon Sep 17 00:00:00 2001 -From: Radek Vykydal -Date: Wed, 21 Aug 2019 15:49:21 +0200 -Subject: [PATCH] Do not use capitals for spoke title. - -Resolves: rhbz#1744185 - -To be consistent with other spokes. ---- - org_fedora_oscap/gui/spokes/oscap.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index 96802cf..0c90fb7 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -195,7 +195,7 @@ class OSCAPSpoke(NormalSpoke): - icon = "changes-prevent-symbolic" - - # title of the spoke (will be displayed on the hub) -- title = N_("_SECURITY POLICY") -+ title = N_("_Security Policy") - - # methods defined by API and helper methods # - def __init__(self, data, storage, payload, instclass): diff --git a/SOURCES/help_id.patch b/SOURCES/help_id.patch deleted file mode 100644 index c4b96e0..0000000 --- a/SOURCES/help_id.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ccd4e2f078d00fa4570d2bd56802c726286d1020 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Wed, 10 Oct 2018 17:12:01 +0200 -Subject: [PATCH] Set help id for the OSCAP addon provided spoke (#1638068) - -The new Anaconda help system now operates on help ids instead of pointing to -individual files. - -So drop the old property and replace it with a proper help_id. - -Resolves: rhbz#1638068 ---- - org_fedora_oscap/gui/spokes/oscap.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index d9fe548..36fd656 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -179,8 +179,8 @@ class OSCAPSpoke(NormalSpoke): - # name of the .glade file in the same directory as this source - uiFile = "oscap.glade" - -- # name of the file providing help content for this spoke -- helpFile = "SecurityPolicySpoke.xml" -+ # id of the help content for this spoke -+ help_id = "SecurityPolicySpoke" - - # domain of oscap-anaconda-addon translations - translationDomain = "oscap-anaconda-addon" diff --git a/SOURCES/lang.patch b/SOURCES/lang.patch index d13a5da..cb82fb2 100644 --- a/SOURCES/lang.patch +++ b/SOURCES/lang.patch @@ -1,8 +1,8 @@ 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 2018-07-02 17:39:45.000000000 +0200 -+++ b/po/ca.po 2019-09-02 16:24:40.305145550 +0200 -@@ -4,24 +4,23 @@ +--- a/po/ca.po 2020-06-02 14:20:56.000000000 +0200 ++++ b/po/ca.po 2020-07-09 17:56:19.312126484 +0200 +@@ -4,14 +4,13 @@ # # Translators: # Robert Antoni Buj i Gelonch , 2015 @@ -12,23 +12,19 @@ diff -U3 -N -r a/po/ca.po b/po/ca.po msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2018-07-02 17:38+0200\n" +-"POT-Creation-Date: 2020-06-01 14:12+0200\n" -"PO-Revision-Date: 2015-09-29 07:30+0000\n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2015-09-29 07:31+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" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Language: ca\n" + "Language: ca\n" +@@ -21,7 +20,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Zanata 4.4.5\n" -+"X-Generator: Zanata 4.6.2\n" + "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:392 -+#: ../org_fedora_oscap/rule_handling.py:398 +-#: ../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 " @@ -36,110 +32,118 @@ diff -U3 -N -r a/po/ca.po b/po/ca.po msgstr "" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:403 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../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,78 @@ +@@ -39,78 +38,86 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:502 -+#: ../org_fedora_oscap/rule_handling.py:511 +-#: ../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:509 -+#: ../org_fedora_oscap/rule_handling.py:518 +-#: ../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:515 -+#: ../org_fedora_oscap/rule_handling.py:524 +-#: ../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:619 --#: ../org_fedora_oscap/rule_handling.py:634 -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../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:643 --#: ../org_fedora_oscap/rule_handling.py:658 -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 +-#: ../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:756 -+#: ../org_fedora_oscap/rule_handling.py:768 +-#: ../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:758 -+#: ../org_fedora_oscap/rule_handling.py:770 +-#: ../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:905 -+#: ../org_fedora_oscap/rule_handling.py:923 +-#: ../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:912 -+#: ../org_fedora_oscap/rule_handling.py:930 +-#: ../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:920 --#: ../org_fedora_oscap/rule_handling.py:957 -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 +-#: ../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:927 --#: ../org_fedora_oscap/rule_handling.py:968 -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 +-#: ../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:934 --#: ../org_fedora_oscap/rule_handling.py:979 -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 +-#: ../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:988 --#: ../org_fedora_oscap/rule_handling.py:1003 -+#: ../org_fedora_oscap/rule_handling.py:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../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 +123,131 @@ +@@ -124,118 +131,131 @@ "%s\n" "The installation should be aborted. Do you wish to continue anyway?" msgstr "" @@ -147,7 +151,7 @@ diff -U3 -N -r a/po/ca.po b/po/ca.po +"%s\n" +"S'hauria d'avortar la instal·lació. Voleu continuar de totes maneres?" - #: ../org_fedora_oscap/ks/oscap.py:449 + #: ../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?" @@ -156,58 +160,57 @@ diff -U3 -N -r a/po/ca.po b/po/ca.po +"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:196 + #: ../org_fedora_oscap/gui/spokes/oscap.py:198 -msgid "_SECURITY POLICY" -msgstr "PERFIL DE _SEGURETAT" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +msgid "_Security Policy" +msgstr "" #. the first status provided -#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 ++#: ../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:373 ++#: ../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:1042 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 +-#: ../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:645 ++#: ../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:784 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 +-#: ../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:792 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 +-#: ../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:800 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 +-#: ../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:808 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 +-#: ../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." @@ -215,23 +218,23 @@ diff -U3 -N -r a/po/ca.po b/po/ca.po +"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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 +-#: ../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:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 +-#: ../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:843 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 +-#: ../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," @@ -240,1359 +243,1330 @@ diff -U3 -N -r a/po/ca.po b/po/ca.po +"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:859 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 +-#: ../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:890 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 +-#: ../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:894 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 +-#: ../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:1032 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 +-#: ../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:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 +-#: ../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:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 +-#: ../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:1056 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 +-#: ../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:1058 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 +-#: ../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:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 +-#: ../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:1140 tmp/oscap.glade.h:13 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 +-#: ../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 2018-07-02 17:39:51.000000000 +0200 -+++ b/po/cs.po 2019-09-02 16:24:40.305145550 +0200 -@@ -5,111 +5,118 @@ +--- a/po/cs.po 2020-06-02 14:21:01.000000000 +0200 ++++ b/po/cs.po 2020-07-09 17:56:19.313126507 +0200 +@@ -5,14 +5,16 @@ # Translators: # vpodzime , 2014-2015 # Zdenek , 2016. #zanata +# Zdenek , 2017. #zanata -+# Daniel Rusek , 2018. #zanata + # Daniel Rusek , 2018. #zanata ++# Matěj Týč , 2020. #zanata msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2018-07-02 17:38+0200\n" --"PO-Revision-Date: 2016-09-15 06:03+0000\n" --"Last-Translator: Zdenek \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2018-10-23 11:02+0000\n" -+"Last-Translator: Daniel Rusek \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" ++"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"PO-Revision-Date: 2020-06-22 05:42-0400\n" ++"Last-Translator: Matěj Týč \n" "Language-Team: Czech (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/cs/)\n" -+"Language: cs\n" + "Language: cs\n" "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Language: cs\n" +@@ -21,7 +23,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" --"X-Generator: Zanata 4.4.5\n" -+"X-Generator: Zanata 4.6.2\n" + "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:392 -+#: ../org_fedora_oscap/rule_handling.py:398 +-#: ../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} musí být na samostatném diskovém nebo logickém oddílu a musí být " -+"vytvořen v rozdělení oddílů předtím, než bude moci být zahájena instalace s " -+"bezpečnostním profilem" +@@ -33,24 +35,24 @@ + "bezpečnostním profilem" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:403 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../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:502 -+#: ../org_fedora_oscap/rule_handling.py:511 +-#: ../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:509 -+#: ../org_fedora_oscap/rule_handling.py:518 +-#: ../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:515 -+#: ../org_fedora_oscap/rule_handling.py:524 +-#: ../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 "" -+"heslo uživatele root je příliš krátké, je vyžadováno delší heslo s nejméně " -+"%d znaky" +@@ -59,58 +61,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:619 --#: ../org_fedora_oscap/rule_handling.py:634 -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../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:643 --#: ../org_fedora_oscap/rule_handling.py:658 -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 +-#: ../org_fedora_oscap/rule_handling.py:661 +-#: ../org_fedora_oscap/rule_handling.py:676 ++#: ../org_fedora_oscap/rule_handling.py:685 ++#, fuzzy, 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 vyloučených balíků, ale nelze jej " ++"odebrat ze zvoleného výběru softwaru zvoleného pro intsalaci." ++ ++#: ../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:756 -+#: ../org_fedora_oscap/rule_handling.py:768 +-#: ../org_fedora_oscap/rule_handling.py:777 ++#: ../org_fedora_oscap/rule_handling.py:808 msgid "Kdump will be disabled on startup" --msgstr "" -+msgstr "Kdump bude při spuštění zakázán" + msgstr "Kdump bude při spuštění zakázán" --#: ../org_fedora_oscap/rule_handling.py:758 -+#: ../org_fedora_oscap/rule_handling.py:770 +-#: ../org_fedora_oscap/rule_handling.py:779 ++#: ../org_fedora_oscap/rule_handling.py:810 msgid "Kdump will be enabled on startup" --msgstr "" -+msgstr "Kdump bude při spuštění povolen" + msgstr "Kdump bude při spuštění povolen" --#: ../org_fedora_oscap/rule_handling.py:905 -+#: ../org_fedora_oscap/rule_handling.py:923 +-#: ../org_fedora_oscap/rule_handling.py:932 ++#: ../org_fedora_oscap/rule_handling.py:963 msgid "Firewall will be disabled on startup" --msgstr "" -+msgstr "Firewall bude při spuštění zakázán" + msgstr "Firewall bude při spuštění zakázán" --#: ../org_fedora_oscap/rule_handling.py:912 -+#: ../org_fedora_oscap/rule_handling.py:930 +-#: ../org_fedora_oscap/rule_handling.py:939 ++#: ../org_fedora_oscap/rule_handling.py:970 msgid "Firewall will be enabled on startup" --msgstr "" -+msgstr "Firewall bude při spuštění povolen" + msgstr "Firewall bude při spuštění povolen" --#: ../org_fedora_oscap/rule_handling.py:920 --#: ../org_fedora_oscap/rule_handling.py:957 -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 +-#: ../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 "" -+msgstr "služba '%s' byla přidána na seznam služeb k přidání do firewallu" + msgstr "služba '%s' byla přidána na seznam služeb k přidání do firewallu" --#: ../org_fedora_oscap/rule_handling.py:927 --#: ../org_fedora_oscap/rule_handling.py:968 -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" --msgstr "" -+msgstr "port '%s' byl přidán na seznam portů k přidání do firewallu" - --#: ../org_fedora_oscap/rule_handling.py:934 --#: ../org_fedora_oscap/rule_handling.py:979 -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" --msgstr "" -+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:988 --#: ../org_fedora_oscap/rule_handling.py:1003 -+#: ../org_fedora_oscap/rule_handling.py:1015 +-#: ../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 "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" --msgstr "" -+msgstr "služba '%s' byla přidána na seznam služeb k odebrání z firewallu" + "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/ks/oscap.py:420 +-#: ../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 -@@ -118,111 +125,118 @@ - "%s\n" - "The installation should be aborted. Do you wish to continue anyway?" - msgstr "" -+"Při získávání a načítání bezpečnostních dat došlo k chybě:\n" -+"%s\n" -+"Instalace by měla být přerušena. Chcete i přesto pokračovat?" - - #: ../org_fedora_oscap/ks/oscap.py:449 msgid "" - "The integrity check of the security content failed.\n" - "The installation should be aborted. Do you wish to continue anyway?" - msgstr "" -+"Test integrity bezpečnostních dat neprošel.\n" -+"Instalace by měla být přerušena. Chcete i přesto pokračovat?" + "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 +150,40 @@ #. title of the spoke (will be displayed on the hub) --#: ../org_fedora_oscap/gui/spokes/oscap.py:196 + #: ../org_fedora_oscap/gui/spokes/oscap.py:198 -msgid "_SECURITY POLICY" -msgstr "_POLITIKA ZABEZPEČENÍ" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +msgid "_Security Policy" -+msgstr "" ++msgstr "_Politika zabezpečení" #. the first status provided -#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 ++#: ../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:373 ++#: ../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:1042 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 +-#: ../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:645 ++#: ../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:784 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 +-#: ../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:792 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 +-#: ../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 "" -+msgstr "Nevalidní nebo nepodporované datové URL, zadejte prosím jiné." + msgstr "Nevalidní nebo nepodporované datové URL, zadejte prosím jiné." --#: ../org_fedora_oscap/gui/spokes/oscap.py:800 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 +-#: ../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:808 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 +-#: ../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 "" -+"Během získávání dat se vyskytla chyba sítě. Zkontrolujte prosím, že je síť " -+"nastavena a funkční." +@@ -179,63 +191,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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 +-#: ../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 "Test integrity dat neprošel. Nelze použít tato data." + msgstr "Test integrity dat neprošel. Nelze použít tato data." --#: ../org_fedora_oscap/gui/spokes/oscap.py:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 +-#: ../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:843 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 +-#: ../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 "" -+msgstr "Profil s ID '%s' není definován v datech. Vyberte prosím jiný profil" + msgstr "Profil s ID '%s' není definován v datech. Vyberte prosím jiný profil" --#: ../org_fedora_oscap/gui/spokes/oscap.py:859 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 +-#: ../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:890 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 +-#: ../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:894 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 +-#: ../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:1032 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 msgid "Error fetching and loading content" --msgstr "" -+msgstr "Chyba při získávání a načítání dat" + msgstr "Chyba při získávání a načítání dat" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 +-#: ../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:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 +-#: ../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:1056 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 +-#: ../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:1058 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 +-#: ../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:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 +-#: ../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:1140 tmp/oscap.glade.h:13 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 +-#: ../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 +295,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 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/de.po 2019-09-02 16:24:40.305145550 +0200 -@@ -0,0 +1,307 @@ -+# Ludek Janda , 2019. #zanata -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2019-08-30 10:55+0000\n" -+"Last-Translator: Ludek Janda \n" -+"Language-Team: German\n" -+"Language: de\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=2; plural=(n != 1)\n" -+"X-Generator: Zanata 4.6.2\n" -+ -+#: ../org_fedora_oscap/rule_handling.py:398 -+#, 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} muss sich auf einer separaten Partition oder einem logischen Volume " -+"befinden und muss im Partitionslayout erstellt werden, bevor die " -+"Installation mit einem Sicherheitsprofil erfolgen kann" -+ -+#. template for the message -+#: ../org_fedora_oscap/rule_handling.py:409 -+#, python-format -+msgid "" -+"mount option '%(mount_option)s' added for the mount point %(mount_point)s" -+msgstr "" -+"Einhängeoption '%(mount_option)s'hinzugefügt für den Einhängepunkt " -+"%(mount_point)s" -+ -+#. root password was not set -+#: ../org_fedora_oscap/rule_handling.py:511 -+#, 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:518 -+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:524 -+#, python-format -+msgid "" -+"root password is too short, a longer one with at least %d characters is " -+"required" -+msgstr "" -+"Das root-Passwort ist zu kurz, ein längeres mit mindestens %d Zeichen sind " -+"erforderlich" -+ -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 -+#, 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:652 -+#: ../org_fedora_oscap/rule_handling.py:667 -+#, 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:768 -+msgid "Kdump will be disabled on startup" -+msgstr "Kdump wird beim Start deaktiviert" -+ -+#: ../org_fedora_oscap/rule_handling.py:770 -+msgid "Kdump will be enabled on startup" -+msgstr "Kdump wird beim Start aktiviert" -+ -+#: ../org_fedora_oscap/rule_handling.py:923 -+msgid "Firewall will be disabled on startup" -+msgstr "Die Firewall wird beim Start deaktiviert" -+ -+#: ../org_fedora_oscap/rule_handling.py:930 -+msgid "Firewall will be enabled on startup" -+msgstr "Die Firewall wird beim Start aktiviert" -+ -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 -+#, python-format -+msgid "" -+"service '%s' has been added to the list of services to be added to the " -+"firewall" -+msgstr "" -+"Bedienung '%s'wurde der Liste der Dienste hinzugefügt, die zur Firewall " -+"hinzugefügt werden sollen" -+ -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 -+#, python-format -+msgid "" -+"port '%s' has been added to the list of ports to be added to the firewall" -+msgstr "" -+"Hafen '%s'wurde der Liste der Ports hinzugefügt, die der Firewall " -+"hinzugefügt werden sollen" -+ -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 -+#, python-format -+msgid "" -+"trust '%s' has been added to the list of trusts to be added to the firewall" -+msgstr "" -+"vertrauen '%s'wurde der Liste der Vertrauensstellungen hinzugefügt, die der " -+"Firewall hinzugefügt werden sollen" -+ -+#: ../org_fedora_oscap/rule_handling.py:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 -+#, python-format -+msgid "" -+"service '%s' has been added to the list of services to be removed from the " -+"firewall" -+msgstr "" -+"Bedienung '%s'wurde der Liste der Dienste hinzugefügt, die aus der Firewall " -+"entfernt werden sollen" -+ -+#: ../org_fedora_oscap/ks/oscap.py:420 -+#, 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 "" -+"Beim Abrufen und Laden des Sicherheitsinhalts ist ein Fehler " -+"aufgetreten:%sDie Installation sollte abgebrochen werden. Möchten Sie " -+"trotzdem fortfahren?" -+ -+#: ../org_fedora_oscap/ks/oscap.py:449 -+msgid "" -+"The integrity check of the security content failed.\n" -+"The installation should be aborted. Do you wish to continue anyway?" -+msgstr "" -+"Die Integritätsprüfung des Sicherheitsinhalts ist fehlgeschlagen. Die " -+"Installation sollte abgebrochen werden. Möchten Sie trotzdem fortfahren?" -+ -+#. title of the spoke (will be displayed on the hub) -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 -+msgid "_Security Policy" -+msgstr "_Sicherheitspolitik" -+ -+#. the first status provided -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 -+msgid "Not ready" -+msgstr "Nicht bereit" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:373 -+msgid "Fetching content data" -+msgstr "Inhaltsdaten abrufen" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+msgid "No profile selected" -+msgstr "Kein Profil ausgewählt" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:645 -+msgid "No rules for the pre-installation phase" -+msgstr "Keine Regeln für die Vorinstallationsphase" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 -+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:805 -+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:813 -+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:821 -+msgid "" -+"Network error encountered when fetching data. Please check that network is " -+"setup and working." -+msgstr "" -+"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:830 -+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:838 -+#, 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:856 -+#, python-format -+msgid "" -+"Profile with ID '%s' not defined in the content. Select a different profile," -+" please" -+msgstr "" -+"Profil mit ID '%s'im Inhalt nicht definiert. Bitte wählen Sie ein anderes " -+"Profil" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 -+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:903 -+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:907 -+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:1045 -+msgid "Error fetching and loading content" -+msgstr "Fehler beim Abrufen und Laden von Inhalten" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 -+msgid "No content found" -+msgstr "Kein Inhalt gefunden" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 -+msgid "Misconfiguration detected" -+msgstr "Fehlkonfiguration erkannt" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 -+msgid "Warnings appeared" -+msgstr "Warnungen erschienen" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 -+msgid "Everything okay" -+msgstr "Alles okay" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 -+msgid "Invalid or unsupported URL" -+msgstr "Ungültige oder nicht unterstützte URL" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 -+msgid "Fetching content..." -+msgstr "Inhalt wird abgerufen ..." -+ -+#: tmp/oscap.glade.h:1 -+msgid "SECURITY POLICY" -+msgstr "SICHERHEITSPOLITIK" -+ -+#: tmp/oscap.glade.h:2 -+msgid "_Change content" -+msgstr "_Ändern Sie den Inhalt" -+ -+#: tmp/oscap.glade.h:3 -+msgid "Apply security policy:" -+msgstr "Sicherheitsrichtlinie anwenden:" -+ -+#: tmp/oscap.glade.h:4 -+msgid "Data stream:" -+msgstr "Datenstrom:" -+ -+#: tmp/oscap.glade.h:5 -+msgid "Checklist:" -+msgstr "Checkliste:" -+ -+#: tmp/oscap.glade.h:6 -+msgid "Choose profile below:" -+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" -+ -+#: tmp/oscap.glade.h:9 -+msgid "_Select profile" -+msgstr "_Wähle Profil" -+ -+#: tmp/oscap.glade.h:10 -+msgid "Changes that were done or need to be done:" -+msgstr "Änderungen, die vorgenommen wurden oder durchgeführt werden müssen:" -+ -+#: tmp/oscap.glade.h:11 -+msgid "_Use SCAP Security Guide" -+msgstr "_Verwenden Sie das SCAP-Sicherheitshandbuch" -+ -+#: tmp/oscap.glade.h:12 -+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 2018-07-02 17:40:45.000000000 +0200 -+++ b/po/es.po 2019-09-02 16:24:40.305145550 +0200 -@@ -5,31 +5,37 @@ - # Translators: - # Gerardo Rosales , 2014 - # Máximo Castañeda Riloba , 2016. #zanata -+# Máximo Castañeda Riloba , 2017. #zanata -+# Máximo Castañeda Riloba , 2018. #zanata -+# Ludek Janda , 2019. #zanata +--- a/po/de.po 2020-06-02 14:21:10.000000000 +0200 ++++ b/po/de.po 2020-07-09 17:56:19.313126507 +0200 +@@ -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: 2018-07-02 17:38+0200\n" --"PO-Revision-Date: 2016-03-26 04:15+0000\n" --"Last-Translator: Máximo Castañeda Riloba \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2019-08-30 10:53+0000\n" -+"Last-Translator: Ludek Janda \n" - "Language-Team: Spanish (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/es/)\n" -+"Language: es\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Language: es\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Zanata 4.4.5\n" -+"X-Generator: Zanata 4.6.2\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:392 -+#: ../org_fedora_oscap/rule_handling.py:398 +-#: ../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} debe estar en una partición separada o en un volumen lógico y debe " -+"crearse en el diseño de particiones antes de que se inicie la instalación " -+"con un perfil de seguridad" +@@ -27,7 +26,7 @@ + "Installation mit einem Sicherheitsprofil erfolgen kann" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:403 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../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,83 +44,92 @@ +@@ -36,21 +35,21 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:502 -+#: ../org_fedora_oscap/rule_handling.py:511 +-#: ../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 2020-07-09 17:56:19.313126507 +0200 +@@ -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:509 -+#: ../org_fedora_oscap/rule_handling.py:518 +-#: ../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:515 -+#: ../org_fedora_oscap/rule_handling.py:524 +-#: ../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 "" -+"la contraseña de root es demasiado corta, se exige una más larga con al " -+"menos %d caracteres" +@@ -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:619 --#: ../org_fedora_oscap/rule_handling.py:634 -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../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:643 --#: ../org_fedora_oscap/rule_handling.py:658 -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 +-#: ../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:756 -+#: ../org_fedora_oscap/rule_handling.py:768 +-#: ../org_fedora_oscap/rule_handling.py:777 ++#: ../org_fedora_oscap/rule_handling.py:808 msgid "Kdump will be disabled on startup" --msgstr "" -+msgstr "Se desactivará Kdump al inicio" + msgstr "Se desactivará Kdump al inicio" --#: ../org_fedora_oscap/rule_handling.py:758 -+#: ../org_fedora_oscap/rule_handling.py:770 +-#: ../org_fedora_oscap/rule_handling.py:779 ++#: ../org_fedora_oscap/rule_handling.py:810 msgid "Kdump will be enabled on startup" --msgstr "" -+msgstr "Se activará Kdump al inicio" + msgstr "Se activará Kdump al inicio" --#: ../org_fedora_oscap/rule_handling.py:905 -+#: ../org_fedora_oscap/rule_handling.py:923 +-#: ../org_fedora_oscap/rule_handling.py:932 ++#: ../org_fedora_oscap/rule_handling.py:963 msgid "Firewall will be disabled on startup" --msgstr "" -+msgstr "Se desactivará el cortafuegos al inicio" + msgstr "Se desactivará el cortafuegos al inicio" --#: ../org_fedora_oscap/rule_handling.py:912 -+#: ../org_fedora_oscap/rule_handling.py:930 +-#: ../org_fedora_oscap/rule_handling.py:939 ++#: ../org_fedora_oscap/rule_handling.py:970 msgid "Firewall will be enabled on startup" --msgstr "" -+msgstr "Se activará el cortafuegos al inicio" + msgstr "Se activará el cortafuegos al inicio" --#: ../org_fedora_oscap/rule_handling.py:920 --#: ../org_fedora_oscap/rule_handling.py:957 -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 +-#: ../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 "" -+"el servicio '%s' se ha añadido a la lista de servicios a añadir al " -+"cortafuegos" +@@ -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:927 --#: ../org_fedora_oscap/rule_handling.py:968 -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 +-#: ../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" + "el puerto '%s' se ha añadido a la lista de puertos a añadir al cortafuegos" --#: ../org_fedora_oscap/rule_handling.py:934 --#: ../org_fedora_oscap/rule_handling.py:979 -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 +-#: ../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 "" -+"confiar%s'se ha agregado a la lista de fideicomisos que se agregarán al " -+"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:988 --#: ../org_fedora_oscap/rule_handling.py:1003 -+#: ../org_fedora_oscap/rule_handling.py:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../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 "" -+"el servicio '%s' se ha añadido a la lista de servicios a quitar del " -+"cortafuegos" - - #: ../org_fedora_oscap/ks/oscap.py:420 - #, python-format -@@ -123,116 +138,128 @@ - "%s\n" - "The installation should be aborted. Do you wish to continue anyway?" - msgstr "" -+"Se produjo un error al obtener y cargar el contenido de seguridad:\n" -+"%s\n" -+"Debería pararse la instalación. ¿Quiere continuar de todas formas?" - - #: ../org_fedora_oscap/ks/oscap.py:449 - msgid "" - "The integrity check of the security content failed.\n" - "The installation should be aborted. Do you wish to continue anyway?" - msgstr "" -+"Falló la comprobación de integridad del contenido de seguridad.\n" -+"Debería pararse la instalación. ¿Quiere continuar de todas formas?" +@@ -151,44 +160,44 @@ #. title of the spoke (will be displayed on the hub) --#: ../org_fedora_oscap/gui/spokes/oscap.py:196 + #: ../org_fedora_oscap/gui/spokes/oscap.py:198 -msgid "_SECURITY POLICY" --msgstr "POLÍTICA DE _SEGURIDAD" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +-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:225 ++#: ../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:373 ++#: ../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:1042 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 +-#: ../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:645 ++#: ../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:784 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 +-#: ../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:792 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 +-#: ../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." + "La URL del contenido no es válida o no está admitida, por favor introduzca " + "una nueva." --#: ../org_fedora_oscap/gui/spokes/oscap.py:800 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 +-#: ../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:808 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 +-#: ../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 "" -+"Se produjo un error de red al obtener los datos. Compruebe que la red está " -+"configurada y en funcionamiento." +@@ -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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 +-#: ../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." + "Falló la comprobación de la integridad del contenido. No se puede usar el " + "mismo." --#: ../org_fedora_oscap/gui/spokes/oscap.py:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 +-#: ../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:843 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 +-#: ../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" +@@ -216,49 +225,49 @@ msgstr "" -+"El perfil con ID '%s' no está definido en el contenido. Elija uno diferente." + "El perfil con ID '%s' no está definido en el contenido. Elija uno diferente." --#: ../org_fedora_oscap/gui/spokes/oscap.py:859 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 +-#: ../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:890 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 +-#: ../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:894 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 +-#: ../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:1032 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 msgid "Error fetching and loading content" --msgstr "" -+msgstr "Error al obtener y cargar el contenido" + msgstr "Error al obtener y cargar el contenido" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 +-#: ../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:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 +-#: ../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:1056 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 +-#: ../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:1058 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 +-#: ../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:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 +-#: ../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:1140 tmp/oscap.glade.h:13 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 +-#: ../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..." -@@ -270,7 +297,7 @@ +@@ -306,11 +315,6 @@ + msgid "_Use SCAP Security Guide" + msgstr "_Usar Guía de seguridad SCAP" - #: tmp/oscap.glade.h:9 - msgid "_Select profile" --msgstr "_Perfil seleccionado" -+msgstr "_Seleccionar perfil" - - #: tmp/oscap.glade.h:10 - msgid "Changes that were done or need to be done:" +-#: 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 2018-07-02 17:39:59.000000000 +0200 -+++ b/po/fr.po 2019-09-02 16:24:40.305145550 +0200 -@@ -5,32 +5,37 @@ +--- a/po/fr.po 2020-06-02 14:21:08.000000000 +0200 ++++ b/po/fr.po 2020-07-09 17:56:19.313126507 +0200 +@@ -5,16 +5,16 @@ # Translators: # dominique bribanick , 2014 # Jérôme Fenal , 2014 -# Jean-Baptiste Holcroft , 2016. #zanata -+# Ludek Janda , 2018. #zanata -+# Ludek Janda , 2019. #zanata -+# corina roe , 2019. #zanata + # 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: 2018-07-02 17:38+0200\n" --"PO-Revision-Date: 2016-07-15 04:50+0000\n" --"Last-Translator: Jean-Baptiste Holcroft \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2019-08-27 10:39+0000\n" -+"Last-Translator: corina roe \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" + "Language: fr\n" "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Language: fr\n" +@@ -23,7 +23,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" --"X-Generator: Zanata 4.4.5\n" -+"X-Generator: Zanata 4.6.2\n" + "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:392 -+#: ../org_fedora_oscap/rule_handling.py:398 +-#: ../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" +@@ -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é." + "{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:403 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../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,84 +44,89 @@ +@@ -44,21 +44,21 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:502 -+#: ../org_fedora_oscap/rule_handling.py:511 +-#: ../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:509 -+#: ../org_fedora_oscap/rule_handling.py:518 +-#: ../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:515 -+#: ../org_fedora_oscap/rule_handling.py:524 +-#: ../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 "" -+"le mot de passe de root est trop court, une longueur d'au moins %d " -+"caractères est requise" +@@ -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:619 --#: ../org_fedora_oscap/rule_handling.py:634 -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../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:643 --#: ../org_fedora_oscap/rule_handling.py:658 -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 +-#: ../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:756 -+#: ../org_fedora_oscap/rule_handling.py:768 +-#: ../org_fedora_oscap/rule_handling.py:777 ++#: ../org_fedora_oscap/rule_handling.py:808 msgid "Kdump will be disabled on startup" --msgstr "" -+msgstr "Kdump va être désactivé au démarrage" + msgstr "Kdump va être désactivé au démarrage" --#: ../org_fedora_oscap/rule_handling.py:758 -+#: ../org_fedora_oscap/rule_handling.py:770 +-#: ../org_fedora_oscap/rule_handling.py:779 ++#: ../org_fedora_oscap/rule_handling.py:810 msgid "Kdump will be enabled on startup" --msgstr "" -+msgstr "Kdump va être activé au démarrage" + msgstr "Kdump va être activé au démarrage" --#: ../org_fedora_oscap/rule_handling.py:905 -+#: ../org_fedora_oscap/rule_handling.py:923 +-#: ../org_fedora_oscap/rule_handling.py:932 ++#: ../org_fedora_oscap/rule_handling.py:963 msgid "Firewall will be disabled on startup" --msgstr "" -+msgstr "Le pare-feu va être désactivé au démarrage" + msgstr "Le pare-feu va être désactivé au démarrage" --#: ../org_fedora_oscap/rule_handling.py:912 -+#: ../org_fedora_oscap/rule_handling.py:930 +-#: ../org_fedora_oscap/rule_handling.py:939 ++#: ../org_fedora_oscap/rule_handling.py:970 msgid "Firewall will be enabled on startup" --msgstr "" -+msgstr "Le pare-feu va être activé au démarrage" + msgstr "Le pare-feu va être activé au démarrage" --#: ../org_fedora_oscap/rule_handling.py:920 --#: ../org_fedora_oscap/rule_handling.py:957 -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 +-#: ../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" +@@ -104,23 +115,23 @@ msgstr "" -+"service « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" + "service « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" --#: ../org_fedora_oscap/rule_handling.py:927 --#: ../org_fedora_oscap/rule_handling.py:968 -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 +-#: ../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 » a été ajouté à la liste des paquets à ajouter au pare-feu" + msgstr "port « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" --#: ../org_fedora_oscap/rule_handling.py:934 --#: ../org_fedora_oscap/rule_handling.py:979 -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 +-#: ../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" + "trust « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" --#: ../org_fedora_oscap/rule_handling.py:988 --#: ../org_fedora_oscap/rule_handling.py:1003 -+#: ../org_fedora_oscap/rule_handling.py:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../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 "" -+"service « %s » a été ajouté à la liste des paquets à retirer du pare-feu" - - #: ../org_fedora_oscap/ks/oscap.py:420 - #, python-format -@@ -125,115 +135,128 @@ - "%s\n" - "The installation should be aborted. Do you wish to continue anyway?" - msgstr "" -+"Il y a eu une erreur lors de l'extraction et du chargement du contenu de sécurité :\n" -+"%s\n" -+"L'installation doit être interrompue. Souhaitez-vous continuer quand même ?" - - #: ../org_fedora_oscap/ks/oscap.py:449 - msgid "" - "The integrity check of the security content failed.\n" - "The installation should be aborted. Do you wish to continue anyway?" - msgstr "" -+"Le contrôle d'intégrité du contenu de sécurité a échoué.\n" -+"L'installation doit être interrompue. Souhaitez-vous continuer quand même ?" +@@ -149,43 +160,43 @@ #. title of the spoke (will be displayed on the hub) --#: ../org_fedora_oscap/gui/spokes/oscap.py:196 + #: ../org_fedora_oscap/gui/spokes/oscap.py:198 -msgid "_SECURITY POLICY" --msgstr "POLITIQUE DE _SÉCURITÉ :" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +-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:225 ++#: ../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:373 ++#: ../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:1042 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 +-#: ../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:645 ++#: ../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:784 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 +-#: ../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:792 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 +-#: ../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." + "URL de contenu non prise en charge ou non valide, veuillez saisir une URL " + "différente." --#: ../org_fedora_oscap/gui/spokes/oscap.py:800 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 +-#: ../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:808 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 +-#: ../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 "" -+"Erreur de réseau lors de l'extraction des données. Veuillez vérifier que le " -+"réseau ait été installé et fonctionne correctement." +@@ -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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 +-#: ../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." + "Le contrôle d'intégrité du contenu a échoué. Impossible d'utiliser le " + "contenu." --#: ../org_fedora_oscap/gui/spokes/oscap.py:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 +-#: ../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:843 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 +-#: ../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." + "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:859 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 +-#: ../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:890 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 +-#: ../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 :" ++" ou saisir un flux de données de contenu ou l'URL d'une archive ci-dessous :" --#: ../org_fedora_oscap/gui/spokes/oscap.py:894 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 +-#: ../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:1032 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 msgid "Error fetching and loading content" --msgstr "" -+msgstr "Erreur d'extraction et de chargement du contenu" + msgstr "Erreur d'extraction et de chargement du contenu" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 +-#: ../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:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 +-#: ../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:1056 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 +-#: ../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:1058 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 +-#: ../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:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 +-#: ../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:1140 tmp/oscap.glade.h:13 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 +-#: ../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 2018-07-02 17:40:07.000000000 +0200 -+++ b/po/hu.po 2019-09-02 16:24:40.305145550 +0200 -@@ -4,31 +4,36 @@ +--- a/po/hu.po 2020-06-02 14:21:14.000000000 +0200 ++++ b/po/hu.po 2020-07-09 17:56:19.313126507 +0200 +@@ -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: 2018-07-02 17:38+0200\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: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2019-03-17 07:29+0000\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" + "Language: hu\n" "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Language: hu\n" +@@ -19,16 +22,19 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Zanata 4.4.5\n" -+"X-Generator: Zanata 4.6.2\n" + "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:392 -+#: ../org_fedora_oscap/rule_handling.py:398 +-#: ../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 " @@ -1604,29 +1578,29 @@ diff -U3 -N -r a/po/hu.po b/po/hu.po +"biztonsági profilon" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:403 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../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 +42,87 @@ +@@ -37,80 +43,95 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:502 -+#: ../org_fedora_oscap/rule_handling.py:511 +-#: ../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:509 -+#: ../org_fedora_oscap/rule_handling.py:518 +-#: ../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:515 -+#: ../org_fedora_oscap/rule_handling.py:524 +-#: ../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 " @@ -1634,50 +1608,58 @@ diff -U3 -N -r a/po/hu.po b/po/hu.po msgstr "" +"root jelszó túl rövid, de hosszabbnak kell lennie legalább %d karakterrel" --#: ../org_fedora_oscap/rule_handling.py:619 --#: ../org_fedora_oscap/rule_handling.py:634 -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../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:643 --#: ../org_fedora_oscap/rule_handling.py:658 -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 +-#: ../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:756 -+#: ../org_fedora_oscap/rule_handling.py:768 +-#: ../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:758 -+#: ../org_fedora_oscap/rule_handling.py:770 +-#: ../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:905 -+#: ../org_fedora_oscap/rule_handling.py:923 +-#: ../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:912 -+#: ../org_fedora_oscap/rule_handling.py:930 +-#: ../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:920 --#: ../org_fedora_oscap/rule_handling.py:957 -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 +-#: ../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 " @@ -1686,20 +1668,20 @@ diff -U3 -N -r a/po/hu.po b/po/hu.po +"szolgáltatás \"%s\" lett hozzáadva a tűzfalhoz hozzáadandó szolgáltatások " +"listájához" --#: ../org_fedora_oscap/rule_handling.py:927 --#: ../org_fedora_oscap/rule_handling.py:968 -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 +-#: ../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:934 --#: ../org_fedora_oscap/rule_handling.py:979 -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 +-#: ../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" @@ -1707,10 +1689,10 @@ diff -U3 -N -r a/po/hu.po b/po/hu.po +"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:988 --#: ../org_fedora_oscap/rule_handling.py:1003 -+#: ../org_fedora_oscap/rule_handling.py:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../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 " @@ -1719,9 +1701,9 @@ diff -U3 -N -r a/po/hu.po b/po/hu.po +"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:420 + #: ../org_fedora_oscap/ks/oscap.py:418 #, python-format -@@ -119,119 +131,131 @@ +@@ -119,119 +140,131 @@ "%s\n" "The installation should be aborted. Do you wish to continue anyway?" msgstr "" @@ -1729,7 +1711,7 @@ diff -U3 -N -r a/po/hu.po b/po/hu.po +"%s\n" +"A telepítést meg kell szakítani. Szeretné folytatni?" - #: ../org_fedora_oscap/ks/oscap.py:449 + #: ../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?" @@ -1738,54 +1720,54 @@ diff -U3 -N -r a/po/hu.po b/po/hu.po +"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:196 + #: ../org_fedora_oscap/gui/spokes/oscap.py:198 -msgid "_SECURITY POLICY" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +-msgstr "" +msgid "_Security Policy" - msgstr "" ++msgstr "_Biztonsági házirend" #. the first status provided -#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 ++#: ../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:373 ++#: ../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:1042 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 +-#: ../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:645 ++#: ../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:784 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 +-#: ../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:792 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 +-#: ../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:800 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 +-#: ../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:808 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 +-#: ../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." @@ -1793,21 +1775,21 @@ diff -U3 -N -r a/po/hu.po b/po/hu.po +"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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 +-#: ../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:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 +-#: ../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:843 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 +-#: ../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," @@ -1816,60 +1798,60 @@ diff -U3 -N -r a/po/hu.po b/po/hu.po +"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:859 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 +-#: ../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:890 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 +-#: ../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:894 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 +-#: ../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:1032 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 +-#: ../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:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 +-#: ../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:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 +-#: ../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:1056 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 +-#: ../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:1058 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 +-#: ../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:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 +-#: ../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:1140 tmp/oscap.glade.h:13 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 +-#: ../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..." @@ -1880,7 +1862,7 @@ diff -U3 -N -r a/po/hu.po b/po/hu.po #: tmp/oscap.glade.h:2 msgid "_Change content" -@@ -239,7 +263,7 @@ +@@ -239,7 +272,7 @@ #: tmp/oscap.glade.h:3 msgid "Apply security policy:" @@ -1889,979 +1871,951 @@ diff -U3 -N -r a/po/hu.po b/po/hu.po #: 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 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/it.po 2019-09-02 16:24:40.305145550 +0200 -@@ -0,0 +1,302 @@ -+# Ludek Janda , 2019. #zanata -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2019-08-30 10:54+0000\n" -+"Last-Translator: Ludek Janda \n" -+"Language-Team: \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" -+ -+#: ../org_fedora_oscap/rule_handling.py:398 -+#, 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} deve essere su una partizione separata o su un volume logico e deve " -+"essere creato nel layout di partizionamento prima che l'installazione possa " -+"avvenire con un profilo di sicurezza" -+ -+#. template for the message -+#: ../org_fedora_oscap/rule_handling.py:409 -+#, python-format -+msgid "" -+"mount option '%(mount_option)s' added for the mount point %(mount_point)s" -+msgstr "" -+"opzione di montaggio%(mount_option)s'aggiunto per il punto di mount " -+"%(mount_point)s" -+ -+#. root password was not set -+#: ../org_fedora_oscap/rule_handling.py:511 -+#, 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:518 -+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:524 -+#, python-format -+msgid "" -+"root password is too short, a longer one with at least %d characters is " -+"required" -+msgstr "" -+"la password di root è troppo breve, più lunga con almeno %d i caratteri sono" -+" obbligatori" -+ -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 -+#, 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:652 -+#: ../org_fedora_oscap/rule_handling.py:667 -+#, 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:768 -+msgid "Kdump will be disabled on startup" -+msgstr "Kdump sarà disabilitato all'avvio" -+ -+#: ../org_fedora_oscap/rule_handling.py:770 -+msgid "Kdump will be enabled on startup" -+msgstr "Kdump sarà abilitato all'avvio" -+ -+#: ../org_fedora_oscap/rule_handling.py:923 -+msgid "Firewall will be disabled on startup" -+msgstr "Il firewall sarà disabilitato all'avvio" -+ -+#: ../org_fedora_oscap/rule_handling.py:930 -+msgid "Firewall will be enabled on startup" -+msgstr "Il firewall sarà abilitato all'avvio" -+ -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 -+#, python-format -+msgid "" -+"service '%s' has been added to the list of services to be added to the " -+"firewall" -+msgstr "" -+"servizio '%s'è stato aggiunto all'elenco dei servizi da aggiungere al " -+"firewall" -+ -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 -+#, 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:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 -+#, 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:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 -+#, python-format -+msgid "" -+"service '%s' has been added to the list of services to be removed from the " -+"firewall" -+msgstr "" -+"servizio '%s'è stato aggiunto all'elenco dei servizi da rimuovere dal " -+"firewall" -+ -+#: ../org_fedora_oscap/ks/oscap.py:420 -+#, 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 "" -+"Si è verificato un errore durante il recupero e il caricamento del contenuto" -+" di sicurezza:%sL'installazione dovrebbe essere interrotta. Vuoi continuare " -+"comunque?" -+ -+#: ../org_fedora_oscap/ks/oscap.py:449 -+msgid "" -+"The integrity check of the security content failed.\n" -+"The installation should be aborted. Do you wish to continue anyway?" -+msgstr "" -+"Il controllo di integrità del contenuto di sicurezza non è riuscito. " -+"L'installazione dovrebbe essere interrotta. Vuoi continuare comunque?" -+ -+#. 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" -+ -+#. the first status provided -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 -+msgid "Not ready" -+msgstr "Non pronto" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:373 -+msgid "Fetching content data" -+msgstr "Recupero dei dati di contenuto" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+msgid "No profile selected" -+msgstr "Nessun profilo selezionato" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:645 -+msgid "No rules for the pre-installation phase" -+msgstr "Nessuna regola per la fase di pre-installazione" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 -+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:805 -+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:813 -+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:821 -+msgid "" -+"Network error encountered when fetching data. Please check that network is " -+"setup and working." -+msgstr "" -+"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:830 -+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:838 -+#, 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:856 -+#, python-format -+msgid "" -+"Profile with ID '%s' not defined in the content. Select a different profile," -+" please" -+msgstr "" -+"Profilo con ID '%s'non definito nel contenuto. Seleziona un profilo diverso," -+" per favore" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 -+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:903 -+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:907 -+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:1045 -+msgid "Error fetching and loading content" -+msgstr "Errore durante il recupero e il caricamento del contenuto" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 -+msgid "No content found" -+msgstr "Nessun contenuto trovato" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 -+msgid "Misconfiguration detected" -+msgstr "Rilevata errata configurazione" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 -+msgid "Warnings appeared" -+msgstr "Sono apparsi avvertimenti" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 -+msgid "Everything okay" -+msgstr "Tutto ok" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 -+msgid "Invalid or unsupported URL" -+msgstr "URL non valido o non supportato" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 -+msgid "Fetching content..." -+msgstr "Recupero del contenuto ..." -+ -+#: tmp/oscap.glade.h:1 -+msgid "SECURITY POLICY" -+msgstr "POLITICA DI SICUREZZA" -+ -+#: tmp/oscap.glade.h:2 -+msgid "_Change content" -+msgstr "_Cambia i contenuti" -+ -+#: tmp/oscap.glade.h:3 -+msgid "Apply security policy:" -+msgstr "Applica la politica di sicurezza:" -+ -+#: tmp/oscap.glade.h:4 -+msgid "Data stream:" -+msgstr "Flusso di dati:" -+ -+#: tmp/oscap.glade.h:5 -+msgid "Checklist:" -+msgstr "Elenco di controllo:" -+ -+#: tmp/oscap.glade.h:6 -+msgid "Choose profile below:" -+msgstr "Scegli il profilo qui sotto:" -+ -+#: tmp/oscap.glade.h:7 -+msgid "Profile" -+msgstr "Profilo" -+ -+#: tmp/oscap.glade.h:8 -+msgid "Selected" -+msgstr "Selezionato" -+ -+#: tmp/oscap.glade.h:9 -+msgid "_Select profile" -+msgstr "_Seleziona profilo" -+ -+#: tmp/oscap.glade.h:10 -+msgid "Changes that were done or need to be done:" -+msgstr "Modifiche che sono state fatte o devono essere fatte:" -+ -+#: tmp/oscap.glade.h:11 -+msgid "_Use SCAP Security Guide" -+msgstr "_Usare Guida alla sicurezza di SCAP" -+ -+#: tmp/oscap.glade.h:12 -+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 2018-07-02 17:40:13.000000000 +0200 -+++ b/po/ja.po 2019-09-02 16:24:40.305145550 +0200 -@@ -1,109 +1,113 @@ --# Ooyama Yosiyuki , 2015. #zanata -+# Ludek Janda , 2017. #zanata -+# Ludek Janda , 2018. #zanata -+# Keiko Moriguchi , 2019. #zanata +--- a/po/it.po 2020-06-02 14:21:18.000000000 +0200 ++++ b/po/it.po 2020-07-09 17:56:19.313126507 +0200 +@@ -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: 2018-07-02 17:38+0200\n" --"PO-Revision-Date: 2015-10-02 03:39+0000\n" --"Last-Translator: Ooyama Yosiyuki \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2019-08-26 05:33+0000\n" -+"Last-Translator: Keiko Moriguchi \n" - "Language-Team: Japanese\n" -+"Language: ja\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Language: ja\n" - "Plural-Forms: nplurals=1; plural=0\n" --"X-Generator: Zanata 4.4.5\n" -+"X-Generator: Zanata 4.6.2\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-30 10:54-0400\n" + "Last-Translator: Ludek Janda \n" + "Language-Team: \n" + "Language: it\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:392 -+#: ../org_fedora_oscap/rule_handling.py:398 +-#: ../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 @@ + "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 +35,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 +57,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 +103,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 +150,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 "_Politica 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 +192,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 +214,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 +305,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 2020-07-09 17:56:19.313126507 +0200 +@@ -1,13 +1,13 @@ +-# Ooyama Yosiyuki , 2015. #zanata ++# Ludek Janda , 2017. #zanata + # 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: 2020-03-10 01:40+0000\n" +-"Last-Translator: Ludek Janda \n" ++"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"PO-Revision-Date: 2020-06-26 04:25-0400\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Japanese\n" + "Language: ja\n" + "MIME-Version: 1.0\n" +@@ -16,7 +16,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 " +@@ -27,82 +27,92 @@ + "は、別のパーティションもしくは論理ボリューム上になければなりません。また、セキュリティープロファイルがインストールされる前にパーティションレイアウトに作成されなければなりません" + + #. 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 文字以上のパスワードを作成してください。" ++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' が、ファイアウォールに追加予定のサービス一覧に追加されました" + +-#: ../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 +140,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 "無効なコンテンツが入力されました。別の 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 + #. 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 "コンテンツの取得およびロードのエラー" + +-#: ../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 +276,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 2020-07-09 17:56:19.313126507 +0200 +@@ -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}은/는 별도의 파티션이나 논리 볼륨이 있어야 하며 보안 프로파일이 설치되기 전에 파티션 레이아웃을 만들어야 합니다. " ++msgstr "{0}은/는 별도의 파티션이나 논리 볼륨이 있어야 하며 보안 프로파일이 설치되기 전에 파티션 레이아웃을 만들어야 합니다" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:403 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../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 "" -+msgstr "マウントオプション '%(mount_option)s' が、マウントポイント %(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:502 -+#: ../org_fedora_oscap/rule_handling.py:511 +-#: ../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 "" -+msgstr "%d 文字以上のパスワードを作成してください。" +-msgstr "최소 %d자 이상으로 암호를 만들어야 합니다 " ++msgstr "최소 %d자 이상으로 암호를 만들어야 합니다" --#: ../org_fedora_oscap/rule_handling.py:509 -+#: ../org_fedora_oscap/rule_handling.py:518 +-#: ../org_fedora_oscap/rule_handling.py:527 ++#: ../org_fedora_oscap/rule_handling.py:536 msgid "cannot check root password length (password is crypted)" --msgstr "" -+msgstr "root パスワードの長さを確認できません (パスワードは暗号化済み)" + msgstr "root 암호 길이를 확인할 수 없습니다 (암호가 암호화됨)" #. too short --#: ../org_fedora_oscap/rule_handling.py:515 -+#: ../org_fedora_oscap/rule_handling.py:524 +-#: ../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 "" -+msgstr "root のパスワードが短すぎます。%d 文字以上にする必要があります。" +-msgstr "root 암호가 너무 짧습니다. 최소 %d자 이어야 합니다." ++msgstr "root 암호가 너무 짧습니다. 최소 %d자 이어야 합니다" --#: ../org_fedora_oscap/rule_handling.py:619 --#: ../org_fedora_oscap/rule_handling.py:634 -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../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 "" -+msgstr "パッケージ '%s' が、インストール予定パッケージ一覧に追加されました" +-msgstr "패키지 '%s'이/가 설치할 패키지 목록에 추가되었습니다. " ++msgstr "패키지 '%s'이/가 설치할 패키지 목록에 추가되었습니다" --#: ../org_fedora_oscap/rule_handling.py:643 --#: ../org_fedora_oscap/rule_handling.py:658 -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 +-#: ../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 "" -+msgstr "パッケージ '%s' が、除外パッケージ一覧に追加されました" +-msgstr "패키지 '%s'이/가 제외된 패키지 목록에 추가되었습니다. " ++msgstr "패키지 '%s'이/가 제외된 패키지 목록에 추가되었습니다" --#: ../org_fedora_oscap/rule_handling.py:756 -+#: ../org_fedora_oscap/rule_handling.py:768 +-#: ../org_fedora_oscap/rule_handling.py:777 ++#: ../org_fedora_oscap/rule_handling.py:808 msgid "Kdump will be disabled on startup" --msgstr "" -+msgstr "Kdump は起動時に無効になります" +-msgstr "시작시 Kdump가 비활성화됩니다. " ++msgstr "시작시 Kdump가 비활성화됩니다" --#: ../org_fedora_oscap/rule_handling.py:758 -+#: ../org_fedora_oscap/rule_handling.py:770 +-#: ../org_fedora_oscap/rule_handling.py:779 ++#: ../org_fedora_oscap/rule_handling.py:810 msgid "Kdump will be enabled on startup" --msgstr "" -+msgstr "Kdump は起動時に有効になります" +-msgstr "시작시 Kdump가 활성화됩니다. " ++msgstr "시작시 Kdump가 활성화됩니다" --#: ../org_fedora_oscap/rule_handling.py:905 -+#: ../org_fedora_oscap/rule_handling.py:923 +-#: ../org_fedora_oscap/rule_handling.py:932 ++#: ../org_fedora_oscap/rule_handling.py:963 msgid "Firewall will be disabled on startup" --msgstr "" -+msgstr "ファイアウォールは起動時に無効になります" +-msgstr "시작시 방화벽이 비활성화됩니다. " ++msgstr "시작시 방화벽이 비활성화됩니다" --#: ../org_fedora_oscap/rule_handling.py:912 -+#: ../org_fedora_oscap/rule_handling.py:930 +-#: ../org_fedora_oscap/rule_handling.py:939 ++#: ../org_fedora_oscap/rule_handling.py:970 msgid "Firewall will be enabled on startup" --msgstr "" -+msgstr "ファイアウォールは起動時に有効になります" +-msgstr "시작시 방화벽이 활성화됩니다. " ++msgstr "시작시 방화벽이 활성화됩니다" --#: ../org_fedora_oscap/rule_handling.py:920 --#: ../org_fedora_oscap/rule_handling.py:957 -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 +-#: ../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 "" -+msgstr "サービス '%s' が、ファイアウォールに追加予定のサービス一覧に追加されました" +-msgstr "서비스 '%s'이/가 방화벽에 추가할 서비스 목록에 추가되었습니다. " ++msgstr "서비스 '%s'이/가 방화벽에 추가할 서비스 목록에 추가되었습니다" --#: ../org_fedora_oscap/rule_handling.py:927 --#: ../org_fedora_oscap/rule_handling.py:968 -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 +-#: ../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 "ポート '%s' が、ファイアウォールに追加予定のポート一覧に追加されました" +-msgstr "포트 '%s'이/가 방화벽에 추가할 포트 목록에 추가되었습니다. " ++msgstr "포트 '%s'이/가 방화벽에 추가할 포트 목록에 추가되었습니다" --#: ../org_fedora_oscap/rule_handling.py:934 --#: ../org_fedora_oscap/rule_handling.py:979 -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 +-#: ../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 "" -+msgstr "トラスト '%s' が、ファイアウォールに追加予定のトラスト一覧に追加されました" +-msgstr "트러스트 '%s'이/가 방화벽에 추가할 트러스트 목록에 추가되었습니다. " ++msgstr "트러스트 '%s'이/가 방화벽에 추가할 트러스트 목록에 추가되었습니다" --#: ../org_fedora_oscap/rule_handling.py:988 --#: ../org_fedora_oscap/rule_handling.py:1003 -+#: ../org_fedora_oscap/rule_handling.py:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../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 "" -+msgstr "サービス '%s' が、ファイアウォールから削除予定のサービス一覧に追加されました" +-msgstr "서비스 '%s'이/가 방화벽에서 제거할 서비스 목록에 추가되었습니다. " ++msgstr "서비스 '%s'이/가 방화벽에서 제거할 서비스 목록에 추가되었습니다" - #: ../org_fedora_oscap/ks/oscap.py:420 + #: ../org_fedora_oscap/ks/oscap.py:418 #, python-format -@@ -112,157 +116,162 @@ - "%s\n" - "The installation should be aborted. Do you wish to continue anyway?" - msgstr "" -+"セキュリティーコンテンツの取得時およびロード時にエラーが発生しました。\n" -+"%s\n" -+"インストールを停止する必要があります。それでも続行しますか?" - - #: ../org_fedora_oscap/ks/oscap.py:449 - msgid "" - "The integrity check of the security content failed.\n" - "The installation should be aborted. Do you wish to continue anyway?" - msgstr "" -+"セキュリティーコンテンツの整合性チェックに失敗しました。\n" -+"インストールを停止する必要があります。それでも続行しますか?" +@@ -126,101 +136,101 @@ #. title of the spoke (will be displayed on the hub) --#: ../org_fedora_oscap/gui/spokes/oscap.py:196 + #: ../org_fedora_oscap/gui/spokes/oscap.py:198 -msgid "_SECURITY POLICY" --msgstr "" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +-msgstr "보안 정책(_S):" +msgid "_Security Policy" -+msgstr "セキュリティーポリシー(_S)" ++msgstr "보안 정책(_S)" #. the first status provided -#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:226 msgid "Not ready" --msgstr "" -+msgstr "準備ができていません" +-msgstr "준비되어 있지 않습니다 " ++msgstr "준비되어 있지 않습니다" -#: ../org_fedora_oscap/gui/spokes/oscap.py:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:373 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:374 msgid "Fetching content data" --msgstr "" -+msgstr "コンテンツデータの取得中" +-msgstr "컨텐츠 데이터를 가져오는 중 " ++msgstr "컨텐츠 데이터를 가져오는 중" -#: ../org_fedora_oscap/gui/spokes/oscap.py:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1042 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 +-#: ../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 "프로파일이 선택되지 않았습니다 " ++msgstr "프로파일이 선택되지 않았습니다" -#: ../org_fedora_oscap/gui/spokes/oscap.py:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:645 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:646 msgid "No rules for the pre-installation phase" --msgstr "" -+msgstr "プレインストールフェーズのルールがありません" +-msgstr "사전 설치 단계의 규칙이 없습니다 " ++msgstr "사전 설치 단계의 규칙이 없습니다" --#: ../org_fedora_oscap/gui/spokes/oscap.py:784 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 +-#: ../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 "" -+msgstr "無効なコンテンツが入力されました。別の URL を入力してください。" +-msgstr "잘못된 내용이 입력되었습니다. 다른 URL을 입력하십시오. " ++msgstr "잘못된 내용이 입력되었습니다. 다른 URL을 입력하십시오." --#: ../org_fedora_oscap/gui/spokes/oscap.py:792 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 +-#: ../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 "" -+msgstr "コンテンツ URL が無効またはサポートされていません。別の URL を入力していません。" +-msgstr "유효하지 않거나 지원되지 않는 컨텐츠 URL입니다. 다른 URL을 입력하십시오. " ++msgstr "유효하지 않거나 지원되지 않는 컨텐츠 URL입니다. 다른 URL을 입력하십시오." --#: ../org_fedora_oscap/gui/spokes/oscap.py:800 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 +-#: ../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 "" -+msgstr "コンテンツの取得に失敗しました。別の URL を入力してください。" +-msgstr "컨텐츠를 가져오지 못했습니다. 다른 URL을 입력하십시오. " ++msgstr "컨텐츠를 가져오지 못했습니다. 다른 URL을 입력하십시오." --#: ../org_fedora_oscap/gui/spokes/oscap.py:808 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 +-#: ../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 "データの取得時にネットワークエラーが発生しました。ネットワークが設定されており、動作していることを確認してください。" +-msgstr "컨텐츠를 가져오는 중 네트워크 오류가 발생했습니다. 네트워크가 제대로 작동하는지 확인하십시오. " ++msgstr "컨텐츠를 가져오는 중 네트워크 오류가 발생했습니다. 네트워크가 제대로 작동하는지 확인하십시오." --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 +-#: ../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 "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。" +-msgstr "컨텐츠 무결성 검사에 실패했습니다. 컨텐츠를 사용할 수 없습니다. " ++msgstr "컨텐츠 무결성 검사에 실패했습니다. 컨텐츠를 사용할 수 없습니다." --#: ../org_fedora_oscap/gui/spokes/oscap.py:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 +-#: ../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 "" -+msgstr "コンテンツ (%s) の抽出に失敗しました。別の URL を入力してください。" +-msgstr "컨텐츠 (%s)을/를 가져오지 못했습니다. 다른 URL을 입력하십시오. " ++msgstr "컨텐츠 (%s)을/를 가져오지 못했습니다. 다른 URL을 입력하십시오." --#: ../org_fedora_oscap/gui/spokes/oscap.py:843 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 +-#: ../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 "" -+msgstr "コンテンツで ID が '%s' のプロファイルが定義されていません。別のプロファイルを選択してください。" +-msgstr "ID '%s'이/가 프로파일에 정의되어 있지 않습니다. 다른 프로파일을 선택하십시오. " ++msgstr "ID '%s'이/가 프로파일에 정의되어 있지 않습니다. 다른 프로파일을 선택하십시오" --#: ../org_fedora_oscap/gui/spokes/oscap.py:859 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:868 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:873 msgid "Not applying security policy" --msgstr "" -+msgstr "セキュリティーポリシーを適用しない" +-msgstr "보안 정책을 적용하지 않음 " ++msgstr "보안 정책을 적용하지 않음" #. TRANSLATORS: the other choice if SCAP Security Guide is also #. available --#: ../org_fedora_oscap/gui/spokes/oscap.py:890 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 +-#: ../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 "" -+msgstr "またはデータストリームコンテンツを入力するか、以下の URL をアーカイブ化する:" +-msgstr "데이터 스트림 컨텐츠를 입력하거나 다음 URL을 아카이브하십시오." ++msgstr "데이터 스트림 컨텐츠를 입력하거나 다음 URL을 아카이브하십시오:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:894 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 +-#: ../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 "" -+msgstr "コンテンツが見つかりませんでした。データストリームコンテンツを入力するか、以下の URL をアーカイブ化してください:" +-msgstr "내용이 없습니다. 데이터 스트림 컨텐츠를 입력하거나 또는 다음 URL을 아카이브하십시오." ++msgstr "내용이 없습니다. 데이터 스트림 컨텐츠를 입력하거나 또는 다음 URL을 아카이브하십시오:" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1032 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 msgid "Error fetching and loading content" --msgstr "" -+msgstr "コンテンツの取得およびロードのエラー" +-msgstr "컨텐츠 오류 가져오기 및 로딩 오류 " ++msgstr "컨텐츠 오류 가져오기 및 로딩 오류" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1048 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 msgid "No content found" --msgstr "" -+msgstr "コンテンツが見つかりませんでした" +-msgstr "컨텐츠를 찾을 수 없음 " ++msgstr "컨텐츠를 찾을 수 없음" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1059 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 msgid "Misconfiguration detected" - msgstr "設定ミスが検出されました" +-msgstr "설정 오류가 감지되었습니다 " ++msgstr "설정 오류가 감지되었습니다" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1065 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 msgid "Warnings appeared" --msgstr "" -+msgstr "警告が表示されました" +-msgstr "경고가 표시되었습니다 " ++msgstr "경고가 표시되었습니다" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1067 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 msgid "Everything okay" - msgstr "すべて OK" + msgstr "모든 것이 정상입니다" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1143 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 msgid "Invalid or unsupported URL" - msgstr "無効またはサポートされていない URL" + msgstr "유효하지 않거나 지원되지 않는 URL" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:13 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 +-#: ../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 "" -+msgstr "コンテンツの取得中..." + msgstr "컨텐츠 가져오는 중..." - #: tmp/oscap.glade.h:1 - msgid "SECURITY POLICY" --msgstr "" -+msgstr "セキュリティーポリシー" - - #: tmp/oscap.glade.h:2 - msgid "_Change content" --msgstr "" -+msgstr "コンテンツの変更(_C)" - - #: tmp/oscap.glade.h:3 - msgid "Apply security policy:" --msgstr "" -+msgstr "セキュリティーポリシーの適用:" - - #: tmp/oscap.glade.h:4 - msgid "Data stream:" --msgstr "" -+msgstr "データストリーム:" - - #: tmp/oscap.glade.h:5 - msgid "Checklist:" --msgstr "" -+msgstr "チェックリスト:" +@@ -246,7 +256,7 @@ #: tmp/oscap.glade.h:6 msgid "Choose profile below:" --msgstr "" -+msgstr "以下のプロファイルを選択:" +-msgstr "프로파일 선택: " ++msgstr "프로파일 선택:" - #: tmp/oscap.glade.h:7 - msgid "Profile" --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 "選択済み" +-msgstr "선택됨 " ++msgstr "선택됨" #: tmp/oscap.glade.h:9 msgid "_Select profile" --msgstr "" -+msgstr "プロファイルを選択(_S)" - - #: tmp/oscap.glade.h:10 - msgid "Changes that were done or need to be done:" --msgstr "" -+msgstr "完了済みの変更または必要な変更" - - #: tmp/oscap.glade.h:11 +@@ -270,11 +280,6 @@ msgid "_Use SCAP Security Guide" --msgstr "" -+msgstr "SCAP セキュリティーガイドを使用する(_U)" + msgstr "SCAP 보안 가이드 사용(_U)" - #: tmp/oscap.glade.h:12 - msgid "_Fetch" +-#: tmp/oscap.glade.h:12 +-msgid "" +-"No content found. Please enter data stream content or archive URI below:" -msgstr "" -+msgstr "取得(_F)" -diff -U3 -N -r a/po/ko.po b/po/ko.po ---- a/po/ko.po 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/ko.po 2019-09-02 16:24:40.305145550 +0200 -@@ -0,0 +1,276 @@ -+# Ludek Janda , 2018. #zanata -+# Eun-Ju Kim , 2019. #zanata -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2019-08-26 11:29+0000\n" -+"Last-Translator: Eun-Ju Kim \n" -+"Language-Team: Korean\n" -+"Language: ko\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=1; plural=0\n" -+"X-Generator: Zanata 4.6.2\n" -+ -+#: ../org_fedora_oscap/rule_handling.py:398 -+#, 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}은/는 별도의 파티션이나 논리 볼륨이 있어야 하며 보안 프로파일이 설치되기 전에 파티션 레이아웃을 만들어야 합니다. " -+ -+#. template for the message -+#: ../org_fedora_oscap/rule_handling.py:409 -+#, 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:511 -+#, python-format -+msgid "make sure to create password with minimal length of %d characters" -+msgstr "최소 %d자 이상으로 암호를 만들어야 합니다 " -+ -+#: ../org_fedora_oscap/rule_handling.py:518 -+msgid "cannot check root password length (password is crypted)" -+msgstr "root 암호 길이를 확인할 수 없습니다 (암호가 암호화됨)" -+ -+#. too short -+#: ../org_fedora_oscap/rule_handling.py:524 -+#, 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:628 -+#: ../org_fedora_oscap/rule_handling.py:643 -+#, python-format -+msgid "package '%s' has been added to the list of to be installed packages" -+msgstr "패키지 '%s'이/가 설치할 패키지 목록에 추가되었습니다. " -+ -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 -+#, python-format -+msgid "package '%s' has been added to the list of excluded packages" -+msgstr "패키지 '%s'이/가 제외된 패키지 목록에 추가되었습니다. " -+ -+#: ../org_fedora_oscap/rule_handling.py:768 -+msgid "Kdump will be disabled on startup" -+msgstr "시작시 Kdump가 비활성화됩니다. " -+ -+#: ../org_fedora_oscap/rule_handling.py:770 -+msgid "Kdump will be enabled on startup" -+msgstr "시작시 Kdump가 활성화됩니다. " -+ -+#: ../org_fedora_oscap/rule_handling.py:923 -+msgid "Firewall will be disabled on startup" -+msgstr "시작시 방화벽이 비활성화됩니다. " -+ -+#: ../org_fedora_oscap/rule_handling.py:930 -+msgid "Firewall will be enabled on startup" -+msgstr "시작시 방화벽이 활성화됩니다. " -+ -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 -+#, 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:945 -+#: ../org_fedora_oscap/rule_handling.py:990 -+#, 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:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 -+#, 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:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 -+#, python-format -+msgid "" -+"service '%s' has been added to the list of services to be removed from the " -+"firewall" -+msgstr "서비스 '%s'이/가 방화벽에서 제거할 서비스 목록에 추가되었습니다. " -+ -+#: ../org_fedora_oscap/ks/oscap.py:420 -+#, python-format -+msgid "" -+"There was an error fetching and loading the security content:\n" -+"%s\n" -+"The installation should be aborted. Do you wish to continue anyway?" -+msgstr "" -+"보안 컨텐츠 가져오기 및 로딩 중 오류가 발생했습니다.:\n" -+"%s\n" -+"설치를 중단해야 합니다. 계속 진행하시겠습니까?" -+ -+#: ../org_fedora_oscap/ks/oscap.py:449 -+msgid "" -+"The integrity check of the security content failed.\n" -+"The installation should be aborted. Do you wish to continue anyway?" -+msgstr "" -+"보안 컨텐츠에 대한 무결성 검사에 실패했습니다.\n" -+"설치를 중단해야 합니다. 계속 진행하시겠습니까?" -+ -+#. title of the spoke (will be displayed on the hub) -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 -+msgid "_Security Policy" -+msgstr "보안 정책(_S)" -+ -+#. the first status provided -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 -+msgid "Not ready" -+msgstr "준비되어 있지 않습니다 " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:373 -+msgid "Fetching content data" -+msgstr "컨텐츠 데이터를 가져오는 중 " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+msgid "No profile selected" -+msgstr "프로파일이 선택되지 않았습니다 " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:645 -+msgid "No rules for the pre-installation phase" -+msgstr "사전 설치 단계의 규칙이 없습니다 " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 -+msgid "Invalid content provided. Enter a different URL, please." -+msgstr "잘못된 내용이 입력되었습니다. 다른 URL을 입력하십시오. " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 -+msgid "Invalid or unsupported content URL, please enter a different one." -+msgstr "유효하지 않거나 지원되지 않는 컨텐츠 URL입니다. 다른 URL을 입력하십시오. " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 -+msgid "Failed to fetch content. Enter a different URL, please." -+msgstr "컨텐츠를 가져오지 못했습니다. 다른 URL을 입력하십시오. " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 -+msgid "" -+"Network error encountered when fetching data. Please check that network is " -+"setup and working." -+msgstr "컨텐츠를 가져오는 중 네트워크 오류가 발생했습니다. 네트워크가 제대로 작동하는지 확인하십시오. " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 -+msgid "The integrity check of the content failed. Cannot use the content." -+msgstr "컨텐츠 무결성 검사에 실패했습니다. 컨텐츠를 사용할 수 없습니다. " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 -+#, python-format -+msgid "Failed to extract content (%s). Enter a different URL, please." -+msgstr "컨텐츠 (%s)을/를 가져오지 못했습니다. 다른 URL을 입력하십시오. " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 -+#, 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:872 -+msgid "Not applying security policy" -+msgstr "보안 정책을 적용하지 않음 " -+ -+#. TRANSLATORS: the other choice if SCAP Security Guide is also -+#. available -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+msgid " or enter data stream content or archive URL below:" -+msgstr "데이터 스트림 컨텐츠를 입력하거나 다음 URL을 아카이브하십시오." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 -+msgid "" -+"No content found. Please enter data stream content or archive URL below:" -+msgstr "내용이 없습니다. 데이터 스트림 컨텐츠를 입력하거나 또는 다음 URL을 아카이브하십시오." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 -+msgid "Error fetching and loading content" -+msgstr "컨텐츠 오류 가져오기 및 로딩 오류 " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 -+msgid "No content found" -+msgstr "컨텐츠를 찾을 수 없음 " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 -+msgid "Misconfiguration detected" -+msgstr "설정 오류가 감지되었습니다 " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 -+msgid "Warnings appeared" -+msgstr "경고가 표시되었습니다 " -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 -+msgid "Everything okay" -+msgstr "모든 것이 정상입니다" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 -+msgid "Invalid or unsupported URL" -+msgstr "유효하지 않거나 지원되지 않는 URL" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 -+msgid "Fetching content..." -+msgstr "컨텐츠 가져오는 중..." -+ -+#: tmp/oscap.glade.h:1 -+msgid "SECURITY POLICY" -+msgstr "보안 정책 " -+ -+#: tmp/oscap.glade.h:2 -+msgid "_Change content" -+msgstr "컨텐츠 변경(_C)" -+ -+#: tmp/oscap.glade.h:3 -+msgid "Apply security policy:" -+msgstr "보안 정책 적용:" -+ -+#: tmp/oscap.glade.h:4 -+msgid "Data stream:" -+msgstr "데이터 스트림:" -+ -+#: tmp/oscap.glade.h:5 -+msgid "Checklist:" -+msgstr "검사 목록:" -+ -+#: tmp/oscap.glade.h:6 -+msgid "Choose profile below:" -+msgstr "프로파일 선택: " -+ -+# auto translated by TM merge from project: RHOSP Director Installation and -+# Usage , version: 11-Korean, DocId: master -+#: tmp/oscap.glade.h:7 -+msgid "Profile" -+msgstr "프로파일" -+ -+#: tmp/oscap.glade.h:8 -+msgid "Selected" -+msgstr "선택됨 " -+ -+#: tmp/oscap.glade.h:9 -+msgid "_Select profile" -+msgstr "프로파일 선택(_S)" -+ -+#: tmp/oscap.glade.h:10 -+msgid "Changes that were done or need to be done:" -+msgstr "완료된 변경사항 또는 필요한 변경사항:" -+ -+#: tmp/oscap.glade.h:11 -+msgid "_Use SCAP Security Guide" -+msgstr "SCAP 보안 가이드 사용(_U)" -+ -+#: tmp/oscap.glade.h:12 -+msgid "_Fetch" -+msgstr "가져오기(_F)" +- + #: tmp/oscap.glade.h:13 + msgid "_Fetch" + msgstr "가져오기(_F)" diff -U3 -N -r a/po/lt.po b/po/lt.po --- a/po/lt.po 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/lt.po 2019-09-02 16:24:40.305145550 +0200 -@@ -0,0 +1,268 @@ ++++ b/po/lt.po 2020-07-09 17:56:19.313126507 +0200 +@@ -0,0 +1,276 @@ +# Watson Yuuma Sato , 2017. #zanata +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2017-11-23 10:16+0000\n" ++"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"PO-Revision-Date: 2017-11-23 10:16-0500\n" +"Last-Translator: Copied by Zanata \n" +"Language-Team: Lithuanian\n" +"Language: lt\n" @@ -2871,7 +2825,7 @@ diff -U3 -N -r a/po/lt.po b/po/lt.po +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"X-Generator: Zanata 4.6.2\n" + -+#: ../org_fedora_oscap/rule_handling.py:398 ++#: ../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 " @@ -2880,89 +2834,97 @@ diff -U3 -N -r a/po/lt.po b/po/lt.po +msgstr "" + +#. template for the message -+#: ../org_fedora_oscap/rule_handling.py:409 ++#: ../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:511 ++#: ../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:518 ++#: ../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:524 ++#: ../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:628 -+#: ../org_fedora_oscap/rule_handling.py:643 ++#: ../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:652 -+#: ../org_fedora_oscap/rule_handling.py:667 ++#: ../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:768 ++#: ../org_fedora_oscap/rule_handling.py:808 +msgid "Kdump will be disabled on startup" +msgstr "" + -+#: ../org_fedora_oscap/rule_handling.py:770 ++#: ../org_fedora_oscap/rule_handling.py:810 +msgid "Kdump will be enabled on startup" +msgstr "" + -+#: ../org_fedora_oscap/rule_handling.py:923 ++#: ../org_fedora_oscap/rule_handling.py:963 +msgid "Firewall will be disabled on startup" +msgstr "" + -+#: ../org_fedora_oscap/rule_handling.py:930 ++#: ../org_fedora_oscap/rule_handling.py:970 +msgid "Firewall will be enabled on startup" +msgstr "" + -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 ++#: ../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:945 -+#: ../org_fedora_oscap/rule_handling.py:990 ++#: ../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:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 ++#: ../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:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 ++#: ../org_fedora_oscap/rule_handling.py:1055 ++#: ../org_fedora_oscap/rule_handling.py:1070 +#, python-format +msgid "" +"service '%s' has been added to the list of services to be removed from the " +"firewall" +msgstr "" + -+#: ../org_fedora_oscap/ks/oscap.py:420 ++#: ../org_fedora_oscap/ks/oscap.py:418 +#, python-format +msgid "" +"There was an error fetching and loading the security content:\n" @@ -2970,7 +2932,7 @@ diff -U3 -N -r a/po/lt.po b/po/lt.po +"The installation should be aborted. Do you wish to continue anyway?" +msgstr "" + -+#: ../org_fedora_oscap/ks/oscap.py:449 ++#: ../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?" @@ -2982,97 +2944,97 @@ diff -U3 -N -r a/po/lt.po b/po/lt.po +msgstr "" + +#. the first status provided -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:226 +msgid "Not ready" +msgstr "" + -+#: ../org_fedora_oscap/gui/spokes/oscap.py:373 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:374 +msgid "Fetching content data" +msgstr "" + -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 ++#: ../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:645 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:646 +msgid "No rules for the pre-installation phase" +msgstr "" + -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 ++#: ../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:805 ++#: ../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:813 ++#: ../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:821 ++#: ../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:830 ++#: ../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:838 ++#: ../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:856 ++#: ../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:872 ++#: ../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:903 ++#: ../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:907 ++#: ../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:1045 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 +msgid "Error fetching and loading content" +msgstr "" + -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1053 +msgid "No content found" +msgstr "" + -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1064 +msgid "Misconfiguration detected" +msgstr "" + -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1070 +msgid "Warnings appeared" +msgstr "" + -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1072 +msgid "Everything okay" +msgstr "" + -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1148 +msgid "Invalid or unsupported URL" +msgstr "" + -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1154 tmp/oscap.glade.h:14 +msgid "Fetching content..." +msgstr "" + @@ -3120,29 +3082,18 @@ diff -U3 -N -r a/po/lt.po b/po/lt.po +msgid "_Use SCAP Security Guide" +msgstr "" + -+#: tmp/oscap.glade.h:12 ++#: tmp/oscap.glade.h:13 +msgid "_Fetch" +msgstr "" -diff -U3 -N -r a/po/Makefile b/po/Makefile ---- a/po/Makefile 2018-06-12 13:50:04.000000000 +0200 -+++ b/po/Makefile 2019-09-02 16:24:40.307145564 +0200 -@@ -41,6 +41,7 @@ - - glade-po: $(GLADEFILES) - rm -rf tmp/ -+ @which intltool-extract > /dev/null 2>&1 || echo "You may not have the intltool-extract installed, don't be surprised if the operation fails." - for f in $(GLADEFILES); do \ - intltool-extract --type=gettext/glade -l $$f ;\ - done diff -U3 -N -r a/po/oscap-anaconda-addon.pot b/po/oscap-anaconda-addon.pot ---- a/po/oscap-anaconda-addon.pot 2018-07-02 17:38:21.000000000 +0200 -+++ b/po/oscap-anaconda-addon.pot 2019-09-02 16:24:40.307145564 +0200 +--- a/po/oscap-anaconda-addon.pot 2020-06-02 14:15:10.000000000 +0200 ++++ b/po/oscap-anaconda-addon.pot 2020-07-09 17:56:19.317126597 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2018-07-02 17:38+0200\n" -+"POT-Creation-Date: 2019-09-02 16:08+0200\n" +-"POT-Creation-Date: 2020-06-02 14:00+0200\n" ++"POT-Creation-Date: 2020-07-09 17:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3150,559 +3101,566 @@ diff -U3 -N -r a/po/oscap-anaconda-addon.pot b/po/oscap-anaconda-addon.pot "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" --#: ../org_fedora_oscap/rule_handling.py:392 -+#: ../org_fedora_oscap/rule_handling.py:398 +-#: ../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,82 @@ +@@ -26,82 +26,90 @@ msgstr "" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:403 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../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:502 -+#: ../org_fedora_oscap/rule_handling.py:511 +-#: ../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:509 -+#: ../org_fedora_oscap/rule_handling.py:518 +-#: ../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:515 -+#: ../org_fedora_oscap/rule_handling.py:524 +-#: ../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:619 --#: ../org_fedora_oscap/rule_handling.py:634 -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../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:643 --#: ../org_fedora_oscap/rule_handling.py:658 -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 +-#: ../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:756 -+#: ../org_fedora_oscap/rule_handling.py:768 +-#: ../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:758 -+#: ../org_fedora_oscap/rule_handling.py:770 +-#: ../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:905 -+#: ../org_fedora_oscap/rule_handling.py:923 +-#: ../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:912 -+#: ../org_fedora_oscap/rule_handling.py:930 +-#: ../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:920 --#: ../org_fedora_oscap/rule_handling.py:957 -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 +-#: ../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:927 --#: ../org_fedora_oscap/rule_handling.py:968 -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 +-#: ../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:934 --#: ../org_fedora_oscap/rule_handling.py:979 -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 +-#: ../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:988 --#: ../org_fedora_oscap/rule_handling.py:1003 -+#: ../org_fedora_oscap/rule_handling.py:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../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 " -@@ -123,102 +123,102 @@ - msgstr "" - - #. title of the spoke (will be displayed on the hub) --#: ../org_fedora_oscap/gui/spokes/oscap.py:196 --msgid "_SECURITY POLICY" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 -+msgid "_Security Policy" +@@ -128,97 +136,97 @@ msgstr "" #. the first status provided --#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 +-#: ../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:369 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:373 +-#: ../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:636 --#: ../org_fedora_oscap/gui/spokes/oscap.py:1042 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 +-#: ../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:641 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:645 +-#: ../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:784 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 +-#: ../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:792 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 +-#: ../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:800 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 +-#: ../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:808 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 +-#: ../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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 +-#: ../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:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 +-#: ../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:843 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 +-#: ../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:859 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 +-#: ../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:890 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 +-#: ../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:894 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 +-#: ../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:1032 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 +-#: ../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:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 +-#: ../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:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 +-#: ../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:1056 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 +-#: ../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:1058 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 +-#: ../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:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 +-#: ../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:1140 tmp/oscap.glade.h:13 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 +-#: ../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 2018-07-02 17:40:34.000000000 +0200 -+++ b/po/pl.po 2019-09-02 16:24:40.305145550 +0200 -@@ -18,114 +18,120 @@ +--- a/po/pl.po 2020-06-02 14:21:36.000000000 +0200 ++++ b/po/pl.po 2020-07-09 17:56:19.313126507 +0200 +@@ -18,14 +18,15 @@ # Tom Berner , 2004 # Wojciech Kapusta , 2006 # Piotr Drąg , 2015. #zanata -# Piotr Drąg , 2016. #zanata +# Piotr Drąg , 2017. #zanata -+# Piotr Drąg , 2018. #zanata -+# Piotr Drąg , 2019. #zanata + # Piotr Drąg , 2018. #zanata ++# Piotr Drąg , 2020. #zanata msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2018-07-02 17:38+0200\n" --"PO-Revision-Date: 2016-09-01 09:18+0000\n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2019-08-26 02:07+0000\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-06-27 05:21-0400\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/pl/)\n" -+"Language: pl\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Language: pl\n" + "Language: pl\n" +@@ -35,19 +36,19 @@ "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.4.5\n" -+"X-Generator: Zanata 4.6.2\n" + "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:392 -+#: ../org_fedora_oscap/rule_handling.py:398 +-#: ../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} musi być na oddzielnej partycji lub woluminie logicznym i musi być " +-"utworzone w układzie partycjonowania, zanim można przeprowadzić instalację " +"{0} musi być na oddzielnej partycji lub woluminie logicznym i musi być " +"utworzone w układzie partycjonowania, zanim można przeprowadzić instalację " -+"za pomocą profilu bezpieczeństwa" + "za pomocą profilu bezpieczeństwa" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:403 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../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 "" --"dodano opcję montowania „%(mount_option)s” dla punktu montowania " -+"dodano opcję montowania \"%(mount_option)s\" dla punktu montowania " +@@ -56,76 +57,87 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:502 -+#: ../org_fedora_oscap/rule_handling.py:511 +-#: ../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:509 -+#: ../org_fedora_oscap/rule_handling.py:518 +-#: ../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:515 -+#: ../org_fedora_oscap/rule_handling.py:524 +-#: ../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 "" +-"hasło roota jest za krótkie, wymagane jest dłuższe z co najmniej %d znakami" +"hasło roota jest za krótkie, wymagane jest dłuższe z co najmniej %d znakami" --#: ../org_fedora_oscap/rule_handling.py:619 --#: ../org_fedora_oscap/rule_handling.py:634 -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../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" -+msgstr "dodano pakiet \"%s\" do listy pakietów do zainstalowania" + msgstr "dodano pakiet „%s” do listy pakietów do zainstalowania" --#: ../org_fedora_oscap/rule_handling.py:643 --#: ../org_fedora_oscap/rule_handling.py:658 -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 +-#: ../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" -+msgstr "dodano pakiet \"%s\" do listy wykluczonych pakietów" + msgstr "dodano pakiet „%s” do listy wykluczonych pakietów" --#: ../org_fedora_oscap/rule_handling.py:756 -+#: ../org_fedora_oscap/rule_handling.py:768 +-#: ../org_fedora_oscap/rule_handling.py:777 ++#: ../org_fedora_oscap/rule_handling.py:808 msgid "Kdump will be disabled on startup" --msgstr "" -+msgstr "Kdump będzie wyłączone podczas uruchamiania" + msgstr "Kdump będzie wyłączone podczas uruchamiania" --#: ../org_fedora_oscap/rule_handling.py:758 -+#: ../org_fedora_oscap/rule_handling.py:770 +-#: ../org_fedora_oscap/rule_handling.py:779 ++#: ../org_fedora_oscap/rule_handling.py:810 msgid "Kdump will be enabled on startup" --msgstr "" -+msgstr "Kdump będzie włączone podczas uruchamiania" + msgstr "Kdump będzie włączone podczas uruchamiania" --#: ../org_fedora_oscap/rule_handling.py:905 -+#: ../org_fedora_oscap/rule_handling.py:923 +-#: ../org_fedora_oscap/rule_handling.py:932 ++#: ../org_fedora_oscap/rule_handling.py:963 msgid "Firewall will be disabled on startup" --msgstr "" -+msgstr "Zapora sieciowa będzie wyłączona podczas uruchamiania" + msgstr "Zapora sieciowa będzie wyłączona podczas uruchamiania" --#: ../org_fedora_oscap/rule_handling.py:912 -+#: ../org_fedora_oscap/rule_handling.py:930 +-#: ../org_fedora_oscap/rule_handling.py:939 ++#: ../org_fedora_oscap/rule_handling.py:970 msgid "Firewall will be enabled on startup" --msgstr "" -+msgstr "Zapora sieciowa będzie włączona podczas uruchamiania" + msgstr "Zapora sieciowa będzie włączona podczas uruchamiania" --#: ../org_fedora_oscap/rule_handling.py:920 --#: ../org_fedora_oscap/rule_handling.py:957 -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 +-#: ../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 "" -+msgstr "dodano usługę \"%s\" do listy usług do dodania do zapory sieciowej" + msgstr "dodano usługę „%s” do listy usług do dodania do zapory sieciowej" --#: ../org_fedora_oscap/rule_handling.py:927 --#: ../org_fedora_oscap/rule_handling.py:968 -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 - #, python-format - msgid "" - "port '%s' has been added to the list of ports to be added to the firewall" --msgstr "" -+msgstr "dodano port \"%s\" do listy portów do dodania do zapory sieciowej" - --#: ../org_fedora_oscap/rule_handling.py:934 --#: ../org_fedora_oscap/rule_handling.py:979 -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 - #, python-format - msgid "" - "trust '%s' has been added to the list of trusts to be added to the firewall" --msgstr "" -+msgstr "dodano zaufanie \"%s\" do listy zaufań do dodania do zapory sieciowej" - --#: ../org_fedora_oscap/rule_handling.py:988 --#: ../org_fedora_oscap/rule_handling.py:1003 -+#: ../org_fedora_oscap/rule_handling.py:1015 +-#: ../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 "" - "service '%s' has been added to the list of services to be removed from the " - "firewall" --msgstr "" -+msgstr "dodano usługę \"%s\" do listy usług do usunięcia z zapory sieciowej" + "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/ks/oscap.py:420 +-#: ../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 -@@ -134,115 +140,126 @@ + 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 " +@@ -139,7 +151,7 @@ "%s\n" "The installation should be aborted. Do you wish to continue anyway?" msgstr "" +-"Wystąpił błąd podczas pobierania i wczytywania treści bezpieczeństwa:\n" +"Wystąpił błąd podczas pobierania i wczytywania treści bezpieczeństwa:\n" -+"%s\n" -+"Instalacja powinna zostać przerwana. Kontynuować mimo to?" + "%s\n" + "Instalacja powinna zostać przerwana. Kontynuować mimo to?" - #: ../org_fedora_oscap/ks/oscap.py:449 - msgid "" - "The integrity check of the security content failed.\n" - "The installation should be aborted. Do you wish to continue anyway?" - msgstr "" -+"Sprawdzenie spójności treści bezpieczeństwa się nie powiodło.\n" -+"Instalacja powinna zostać przerwana. Kontynuować mimo to?" +@@ -153,59 +165,59 @@ #. title of the spoke (will be displayed on the hub) --#: ../org_fedora_oscap/gui/spokes/oscap.py:196 + #: ../org_fedora_oscap/gui/spokes/oscap.py:198 -msgid "_SECURITY POLICY" -msgstr "_POLITYKA BEZPIECZEŃSTWA" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +msgid "_Security Policy" -+msgstr "_Polityka bezpieczeństwa" ++msgstr "_Zasady bezpieczeństwa" #. the first status provided -#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 ++#: ../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:373 ++#: ../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:1042 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 +-#: ../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:645 ++#: ../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:784 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 +-#: ../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:792 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 +-#: ../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." + "Nieprawidłowy lub nieobsługiwany adres URL treści, proszę wybrać inny." --#: ../org_fedora_oscap/gui/spokes/oscap.py:800 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 +-#: ../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:808 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 +-#: ../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 "" -+"Wystąpił błąd sieci podczas pobierania danych. Proszę sprawdzić, czy sieć " + "Wystąpił błąd sieci podczas pobierania danych. Proszę sprawdzić, czy sieć " +-"została ustawiona i działa poprawnie." +"została ustawiona i działa poprawnie." --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 +-#: ../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." + "Sprawdzenie integralności treści się nie powiodło. Nie można użyć treści." --#: ../org_fedora_oscap/gui/spokes/oscap.py:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 +-#: ../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:843 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 +-#: ../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 "" -+"W treści nie określono profilu o identyfikatorze \"%s\". Proszę wybrać inny " -+"profil" +@@ -214,49 +226,49 @@ + "W treści nie określono profilu o identyfikatorze „%s”. Proszę wybrać inny " + "profil" --#: ../org_fedora_oscap/gui/spokes/oscap.py:859 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 +-#: ../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 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:890 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 +-#: ../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:894 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 +-#: ../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:1032 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 msgid "Error fetching and loading content" --msgstr "" +-msgstr "Błąd podczas pobierania i wczytywania treści" +msgstr "Błąd podczas pobierania i wczytywania treści" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 +-#: ../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:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 +-#: ../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:1056 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 +-#: ../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:1058 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 +-#: ../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" +msgstr "Wszystko jest w porządku" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 +-#: ../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:1140 tmp/oscap.glade.h:13 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 +-#: ../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…" -+msgstr "Pobieranie treści..." + msgstr "Pobieranie treści…" - #: tmp/oscap.glade.h:1 - msgid "SECURITY POLICY" -@@ -282,7 +299,7 @@ +@@ -270,7 +282,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:" +@@ -298,17 +310,12 @@ #: tmp/oscap.glade.h:10 msgid "Changes that were done or need to be done:" @@ -3711,360 +3669,346 @@ diff -U3 -N -r a/po/pl.po b/po/pl.po #: tmp/oscap.glade.h:11 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 2018-07-02 17:40:36.000000000 +0200 -+++ b/po/pt_BR.po 2019-09-02 16:24:40.305145550 +0200 -@@ -4,32 +4,36 @@ +--- a/po/pt_BR.po 2020-06-02 14:21:38.000000000 +0200 ++++ b/po/pt_BR.po 2020-07-09 17:56:19.313126507 +0200 +@@ -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 + # Ludek Janda , 2019. #zanata msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2018-07-02 17:38+0200\n" --"PO-Revision-Date: 2015-10-07 08:29+0000\n" --"Last-Translator: Marco Aurélio Krause \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2019-08-30 10:52+0000\n" -+"Last-Translator: Ludek Janda \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" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Language: pt_BR\n" + "Language: pt_BR\n" +@@ -22,7 +21,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" --"X-Generator: Zanata 4.4.5\n" -+"X-Generator: Zanata 4.6.2\n" + "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:392 -+#: ../org_fedora_oscap/rule_handling.py:398 +-#: ../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} deve estar em uma partição separada ou em um volume lógico e deve ser " -+"criado no layout de particionamento antes que a instalação possa ocorrer com" -+" um perfil de segurança" +@@ -34,7 +33,7 @@ + " um perfil de segurança" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:403 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../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,83 +42,91 @@ +@@ -43,20 +42,20 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:502 -+#: ../org_fedora_oscap/rule_handling.py:511 +-#: ../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:509 -+#: ../org_fedora_oscap/rule_handling.py:518 +-#: ../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:515 -+#: ../org_fedora_oscap/rule_handling.py:524 +-#: ../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 "" -+"A senha root é muito curta, uma mais longa com pelo menos %d caracteres são " -+"obrigatórios" +@@ -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:619 --#: ../org_fedora_oscap/rule_handling.py:634 -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../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:643 --#: ../org_fedora_oscap/rule_handling.py:658 -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 +-#: ../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:756 -+#: ../org_fedora_oscap/rule_handling.py:768 +-#: ../org_fedora_oscap/rule_handling.py:777 ++#: ../org_fedora_oscap/rule_handling.py:808 msgid "Kdump will be disabled on startup" --msgstr "" -+msgstr "O Kdump será desativado na inicialização" + msgstr "O Kdump será desativado na inicialização" --#: ../org_fedora_oscap/rule_handling.py:758 -+#: ../org_fedora_oscap/rule_handling.py:770 +-#: ../org_fedora_oscap/rule_handling.py:779 ++#: ../org_fedora_oscap/rule_handling.py:810 msgid "Kdump will be enabled on startup" --msgstr "" -+msgstr "O Kdump será ativado na inicialização" + msgstr "O Kdump será ativado na inicialização" --#: ../org_fedora_oscap/rule_handling.py:905 -+#: ../org_fedora_oscap/rule_handling.py:923 +-#: ../org_fedora_oscap/rule_handling.py:932 ++#: ../org_fedora_oscap/rule_handling.py:963 msgid "Firewall will be disabled on startup" --msgstr "" -+msgstr "Firewall será desativado na inicialização" + msgstr "Firewall será desativado na inicialização" --#: ../org_fedora_oscap/rule_handling.py:912 -+#: ../org_fedora_oscap/rule_handling.py:930 +-#: ../org_fedora_oscap/rule_handling.py:939 ++#: ../org_fedora_oscap/rule_handling.py:970 msgid "Firewall will be enabled on startup" --msgstr "" -+msgstr "Firewall será ativado na inicialização" + msgstr "Firewall será ativado na inicialização" --#: ../org_fedora_oscap/rule_handling.py:920 --#: ../org_fedora_oscap/rule_handling.py:957 -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 +-#: ../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" - msgstr "" -+"serviço '%s'foi adicionado à lista de serviços a serem adicionados ao " -+"firewall" --#: ../org_fedora_oscap/rule_handling.py:927 --#: ../org_fedora_oscap/rule_handling.py:968 -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 +-#: ../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" + "port '%s'foi adicionado à lista de portas a serem adicionadas ao firewall" --#: ../org_fedora_oscap/rule_handling.py:934 --#: ../org_fedora_oscap/rule_handling.py:979 -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 +-#: ../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 "" -+"Confiar em '%s'foi adicionado à lista de relações de confiança a serem " -+"adicionadas ao 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:988 --#: ../org_fedora_oscap/rule_handling.py:1003 -+#: ../org_fedora_oscap/rule_handling.py:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../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 "" -+"serviço '%s'foi adicionado à lista de serviços a serem removidos do firewall" - - #: ../org_fedora_oscap/ks/oscap.py:420 - #, python-format -@@ -123,113 +135,125 @@ - "%s\n" - "The installation should be aborted. Do you wish to continue anyway?" - msgstr "" -+"Ocorreu um erro ao buscar e carregar o conteúdo de segurança:\n" -+"%s\n" -+"A instalação deve ser interrompida. Deseja continuar assim mesmo?" - - #: ../org_fedora_oscap/ks/oscap.py:449 - msgid "" - "The integrity check of the security content failed.\n" - "The installation should be aborted. Do you wish to continue anyway?" - msgstr "" -+"A verificação de integridade do conteúdo de segurança falhou.\n" -+"A instalação deve ser interrompida. Deseja continuar assim mesmo?" +@@ -150,41 +157,41 @@ #. title of the spoke (will be displayed on the hub) --#: ../org_fedora_oscap/gui/spokes/oscap.py:196 + #: ../org_fedora_oscap/gui/spokes/oscap.py:198 -msgid "_SECURITY POLICY" -msgstr "_POLÍTICA DE SEGURANÇA" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +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:225 ++#: ../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:373 ++#: ../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:1042 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 +-#: ../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:645 ++#: ../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:784 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 +-#: ../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:792 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 +-#: ../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." + "URL do conteúdo inválido ou não suportado, entre com um outro diferente." --#: ../org_fedora_oscap/gui/spokes/oscap.py:800 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 +-#: ../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:808 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 +-#: ../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 "" -+"Foi encontrado um erro na rede ao buscar dados. Verifique se a rede está " -+"configurada e funcionando." +@@ -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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 +-#: ../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." + "A verificação de integridade do conteúdo falhou. Não é possível usar o " + "conteúdo." --#: ../org_fedora_oscap/gui/spokes/oscap.py:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 +-#: ../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:843 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 +-#: ../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 "" -+"Perfil com ID '%s' não definido no conteúdo. Selecione um perfil diferente, " -+"por favor" +@@ -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:859 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 +-#: ../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:890 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 +-#: ../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:894 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 +-#: ../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:1032 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 +-#: ../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 buscar e carregar o conteúdo" + msgstr "Erro ao buscar e carregar o conteúdo" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 +-#: ../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:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 +-#: ../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:1056 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 +-#: ../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:1058 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 +-#: ../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:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 +-#: ../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:1140 tmp/oscap.glade.h:13 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 +-#: ../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 2018-07-02 17:40:35.000000000 +0200 -+++ b/po/pt.po 2019-09-02 16:24:40.305145550 +0200 -@@ -1,20 +1,20 @@ --# Manuela Silva , 2015. #zanata -+# Manuela Silva , 2015. #zanata - msgid "" +--- a/po/pt.po 2020-06-02 14:21:37.000000000 +0200 ++++ b/po/pt.po 2020-07-09 17:56:19.314126529 +0200 +@@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2018-07-02 17:38+0200\n" +-"POT-Creation-Date: 2020-06-01 14:12+0200\n" -"PO-Revision-Date: 2015-09-13 10:49+0000\n" --"Last-Translator: Manuela Silva \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2015-09-12 01:40+0000\n" -+"Last-Translator: Manuela Silva \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" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Language: pt\n" + "Language: pt\n" +@@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1)\n" --"X-Generator: Zanata 4.4.5\n" -+"X-Generator: Zanata 4.6.2\n" + "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:392 -+#: ../org_fedora_oscap/rule_handling.py:398 +-#: ../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,82 @@ +@@ -23,87 +23,90 @@ msgstr "" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:403 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../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" @@ -4073,232 +4017,238 @@ diff -U3 -N -r a/po/pt.po b/po/pt.po -"%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:502 -+#: ../org_fedora_oscap/rule_handling.py:511 +-#: ../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:509 -+#: ../org_fedora_oscap/rule_handling.py:518 +-#: ../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:515 -+#: ../org_fedora_oscap/rule_handling.py:524 +-#: ../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:619 --#: ../org_fedora_oscap/rule_handling.py:634 -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../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:643 --#: ../org_fedora_oscap/rule_handling.py:658 -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 +-#: ../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:756 -+#: ../org_fedora_oscap/rule_handling.py:768 +-#: ../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:758 -+#: ../org_fedora_oscap/rule_handling.py:770 +-#: ../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:905 -+#: ../org_fedora_oscap/rule_handling.py:923 +-#: ../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:912 -+#: ../org_fedora_oscap/rule_handling.py:930 +-#: ../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:920 --#: ../org_fedora_oscap/rule_handling.py:957 -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 +-#: ../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:927 --#: ../org_fedora_oscap/rule_handling.py:968 -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 +-#: ../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:934 --#: ../org_fedora_oscap/rule_handling.py:979 -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 +-#: ../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:988 --#: ../org_fedora_oscap/rule_handling.py:1003 -+#: ../org_fedora_oscap/rule_handling.py:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../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 " -@@ -125,102 +120,102 @@ - msgstr "" +@@ -126,101 +129,101 @@ #. title of the spoke (will be displayed on the hub) --#: ../org_fedora_oscap/gui/spokes/oscap.py:196 + #: ../org_fedora_oscap/gui/spokes/oscap.py:198 -msgid "_SECURITY POLICY" -msgstr "POLÍTICA DE _SEGURANÇA" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +msgid "_Security Policy" +msgstr "" #. the first status provided -#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 ++#: ../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:373 ++#: ../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:1042 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 +-#: ../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:645 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:646 msgid "No rules for the pre-installation phase" msgstr "" --#: ../org_fedora_oscap/gui/spokes/oscap.py:784 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 +-#: ../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:792 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 +-#: ../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:800 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 +-#: ../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:808 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 +-#: ../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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 +-#: ../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:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 +-#: ../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:843 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 +-#: ../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:859 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 +-#: ../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:890 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 +-#: ../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:894 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 +-#: ../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:1032 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 +-#: ../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:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 +-#: ../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:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 +-#: ../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:1056 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 +-#: ../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:1058 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 +-#: ../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:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 +-#: ../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:1140 tmp/oscap.glade.h:13 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 +-#: ../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 +229,7 @@ +@@ -234,7 +237,7 @@ #: tmp/oscap.glade.h:3 msgid "Apply security policy:" @@ -4307,7 +4257,7 @@ diff -U3 -N -r a/po/pt.po b/po/pt.po #: tmp/oscap.glade.h:4 msgid "Data stream:" -@@ -246,28 +241,28 @@ +@@ -246,33 +249,28 @@ #: tmp/oscap.glade.h:6 msgid "Choose profile below:" @@ -4337,335 +4287,326 @@ diff -U3 -N -r a/po/pt.po b/po/pt.po #: tmp/oscap.glade.h:11 msgid "_Use SCAP Security Guide" -msgstr "_Utilize o Guia de Segurança SCAP" -+msgstr "" +- +-#: tmp/oscap.glade.h:12 +-msgid "" +-"No content found. Please enter data stream content or archive URI below:" + msgstr "" - #: tmp/oscap.glade.h:12 + #: 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 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/ru.po 2019-09-02 16:24:40.306145557 +0200 -@@ -0,0 +1,294 @@ -+# Ludek Janda , 2019. #zanata -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2019-08-27 03:32+0000\n" -+"Last-Translator: Ludek Janda \n" -+"Language-Team: \n" -+"Language: ru\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<12 || n%100>14) ? 1 : 2);\n" -+"X-Generator: Zanata 4.6.2\n" -+ -+#: ../org_fedora_oscap/rule_handling.py:398 -+#, 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} должен быть на отдельном разделе или логическом томе и должен быть " -+"создан в макете разбиения до того, как установка может произойти с профилем " -+"безопасности" -+ -+#. template for the message -+#: ../org_fedora_oscap/rule_handling.py:409 -+#, python-format -+msgid "" -+"mount option '%(mount_option)s' added for the mount point %(mount_point)s" -+msgstr "" -+"mount option '%(mount_option)s'добавлен для точки монтирования " -+"%(mount_point)s" -+ -+#. root password was not set -+#: ../org_fedora_oscap/rule_handling.py:511 -+#, python-format -+msgid "make sure to create password with minimal length of %d characters" -+msgstr "не забудьте создать пароль с минимальной длиной %d персонажи" -+ -+#: ../org_fedora_oscap/rule_handling.py:518 -+msgid "cannot check root password length (password is crypted)" -+msgstr "не удается проверить длину пароля root (пароль зашифрован)" -+ -+#. too short -+#: ../org_fedora_oscap/rule_handling.py:524 -+#, 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:628 -+#: ../org_fedora_oscap/rule_handling.py:643 -+#, python-format -+msgid "package '%s' has been added to the list of to be installed packages" -+msgstr "пакет '%s'добавлен в список установленных пакетов" -+ -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 -+#, python-format -+msgid "package '%s' has been added to the list of excluded packages" -+msgstr "пакет '%s'добавлен в список исключенных пакетов" -+ -+#: ../org_fedora_oscap/rule_handling.py:768 -+msgid "Kdump will be disabled on startup" -+msgstr "Kdump будет отключен при запуске" -+ -+#: ../org_fedora_oscap/rule_handling.py:770 -+msgid "Kdump will be enabled on startup" -+msgstr "Kdump будет включен при запуске" -+ -+#: ../org_fedora_oscap/rule_handling.py:923 -+msgid "Firewall will be disabled on startup" -+msgstr "Брандмауэр будет отключен при запуске" -+ -+#: ../org_fedora_oscap/rule_handling.py:930 -+msgid "Firewall will be enabled on startup" -+msgstr "Брандмауэр будет включен при запуске" -+ -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 -+#, 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:945 -+#: ../org_fedora_oscap/rule_handling.py:990 -+#, 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:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 -+#, 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:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 -+#, python-format -+msgid "" -+"service '%s' has been added to the list of services to be removed from the " -+"firewall" -+msgstr "" -+"оказание услуг '%s'добавлен в список служб, которые необходимо удалить из " -+"брандмауэра" -+ -+#: ../org_fedora_oscap/ks/oscap.py:420 -+#, python-format -+msgid "" -+"There was an error fetching and loading the security content:\n" -+"%s\n" -+"The installation should be aborted. Do you wish to continue anyway?" -+msgstr "" -+"Ошибка получения и загрузки содержимого безопасности:%sУстановка должна быть" -+" прервана. Вы все равно хотите продолжить?" -+ -+#: ../org_fedora_oscap/ks/oscap.py:449 -+msgid "" -+"The integrity check of the security content failed.\n" -+"The installation should be aborted. Do you wish to continue anyway?" -+msgstr "" -+"Не удалось проверить целостность содержимого безопасности. Установка должна " -+"быть прервана. Вы все равно хотите продолжить?" -+ -+#. title of the spoke (will be displayed on the hub) -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 -+msgid "_Security Policy" -+msgstr "_Политика безопасности" -+ -+#. the first status provided -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 -+msgid "Not ready" -+msgstr "Не готов" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:373 -+msgid "Fetching content data" -+msgstr "Получение данных контента" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+msgid "No profile selected" -+msgstr "Не выбран профиль" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:645 -+msgid "No rules for the pre-installation phase" -+msgstr "Нет правил для этапа предварительной установки" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 -+msgid "Invalid content provided. Enter a different URL, please." -+msgstr "Недопустимый контент. Введите другой URL-адрес, пожалуйста." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 -+msgid "Invalid or unsupported content URL, please enter a different one." -+msgstr "Неверный или неподдерживаемый URL-адрес контента, введите другой." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 -+msgid "Failed to fetch content. Enter a different URL, please." -+msgstr "Не удалось получить контент. Введите другой URL-адрес, пожалуйста." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 -+msgid "" -+"Network error encountered when fetching data. Please check that network is " -+"setup and working." -+msgstr "" -+"Ошибка сети при сборе данных. Убедитесь, что сеть настроена и работает." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 -+msgid "The integrity check of the content failed. Cannot use the content." -+msgstr "" -+"Не удалось проверить целостность содержимого. Невозможно использовать " -+"контент." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 -+#, python-format -+msgid "Failed to extract content (%s). Enter a different URL, please." -+msgstr "" -+"Не удалось извлечь контент (%s). Введите другой URL-адрес, пожалуйста." -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 -+#, python-format -+msgid "" -+"Profile with ID '%s' not defined in the content. Select a different profile," -+" please" -+msgstr "" -+"Профиль с идентификатором '%s'не определено в контенте. Выберите другой " -+"профиль, пожалуйста" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 -+msgid "Not applying security policy" -+msgstr "Не применять политику безопасности" -+ -+#. TRANSLATORS: the other choice if SCAP Security Guide is also -+#. available -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+msgid " or enter data stream content or archive URL below:" -+msgstr " или введите содержимое потока данных или URL-адрес архива ниже:" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 -+msgid "" -+"No content found. Please enter data stream content or archive URL below:" -+msgstr "" -+"Контент не найден. Введите содержимое потока данных или URL-адрес архива " -+"ниже:" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 -+msgid "Error fetching and loading content" -+msgstr "Ошибка получения и загрузки содержимого" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 -+msgid "No content found" -+msgstr "Не найдено ни одного контента" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 -+msgid "Misconfiguration detected" -+msgstr "Обнаружено несоответствие" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 -+msgid "Warnings appeared" -+msgstr "Появились предупреждения" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 -+msgid "Everything okay" -+msgstr "Все в порядке" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 -+msgid "Invalid or unsupported URL" -+msgstr "Недействительный или неподдерживаемый URL" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 -+msgid "Fetching content..." -+msgstr "Получение контента ..." -+ -+#: tmp/oscap.glade.h:1 -+msgid "SECURITY POLICY" -+msgstr "ПОЛИТИКА БЕЗОПАСНОСТИ" -+ -+#: tmp/oscap.glade.h:2 -+msgid "_Change content" -+msgstr "_Изменить контент" -+ -+#: tmp/oscap.glade.h:3 -+msgid "Apply security policy:" -+msgstr "Применение политики безопасности:" -+ -+#: tmp/oscap.glade.h:4 -+msgid "Data stream:" -+msgstr "Поток данных:" -+ -+#: tmp/oscap.glade.h:5 -+msgid "Checklist:" -+msgstr "Контрольный список:" -+ -+#: tmp/oscap.glade.h:6 -+msgid "Choose profile below:" -+msgstr "Выберите профиль ниже:" -+ -+#: tmp/oscap.glade.h:7 -+msgid "Profile" -+msgstr "Профиль" -+ -+#: tmp/oscap.glade.h:8 -+msgid "Selected" -+msgstr "выбранный" -+ -+#: tmp/oscap.glade.h:9 -+msgid "_Select profile" -+msgstr "_Выбрать профиль" -+ -+#: tmp/oscap.glade.h:10 -+msgid "Changes that were done or need to be done:" -+msgstr "Изменения, которые были сделаны или должны быть выполнены:" -+ -+#: tmp/oscap.glade.h:11 -+msgid "_Use SCAP Security Guide" -+msgstr "_Используйте руководство по безопасности SCAP" -+ -+#: tmp/oscap.glade.h:12 -+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 2018-07-02 17:40:40.000000000 +0200 -+++ b/po/sr.po 2019-09-02 16:24:40.306145557 +0200 -@@ -9,18 +9,18 @@ +--- a/po/ru.po 2020-06-02 14:21:40.000000000 +0200 ++++ b/po/ru.po 2020-07-09 17:56:19.314126529 +0200 +@@ -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: 2018-07-02 17:38+0200\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 2020-07-09 17:56:19.314126529 +0200 +@@ -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: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2015-04-18 05: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" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"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.4.5\n" -+"X-Generator: Zanata 4.6.2\n" + "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:392 -+#: ../org_fedora_oscap/rule_handling.py:398 +-#: ../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 " @@ -4673,241 +4614,564 @@ diff -U3 -N -r a/po/sr.po b/po/sr.po msgstr "" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:403 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../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,75 @@ +@@ -38,75 +38,83 @@ "%(mount_point)s" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:502 -+#: ../org_fedora_oscap/rule_handling.py:511 +-#: ../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:509 -+#: ../org_fedora_oscap/rule_handling.py:518 +-#: ../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:515 -+#: ../org_fedora_oscap/rule_handling.py:524 +-#: ../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:619 --#: ../org_fedora_oscap/rule_handling.py:634 -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../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:643 --#: ../org_fedora_oscap/rule_handling.py:658 -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 +-#: ../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:756 -+#: ../org_fedora_oscap/rule_handling.py:768 +-#: ../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:758 -+#: ../org_fedora_oscap/rule_handling.py:770 +-#: ../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:905 -+#: ../org_fedora_oscap/rule_handling.py:923 +-#: ../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:912 -+#: ../org_fedora_oscap/rule_handling.py:930 +-#: ../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:920 --#: ../org_fedora_oscap/rule_handling.py:957 -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 +-#: ../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:927 --#: ../org_fedora_oscap/rule_handling.py:968 -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 +-#: ../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:934 --#: ../org_fedora_oscap/rule_handling.py:979 -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 +-#: ../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:988 --#: ../org_fedora_oscap/rule_handling.py:1003 -+#: ../org_fedora_oscap/rule_handling.py:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../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,104 +128,104 @@ - msgstr "" +@@ -129,103 +137,103 @@ #. title of the spoke (will be displayed on the hub) --#: ../org_fedora_oscap/gui/spokes/oscap.py:196 + #: ../org_fedora_oscap/gui/spokes/oscap.py:198 -msgid "_SECURITY POLICY" -msgstr "_БЕЗБЕДНОСНИ МОДЕЛ" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +msgid "_Security Policy" +msgstr "" #. the first status provided -#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 ++#: ../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:373 ++#: ../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:1042 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 +-#: ../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:645 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:646 msgid "No rules for the pre-installation phase" msgstr "Нема правила за пред-инсталациону фазу" --#: ../org_fedora_oscap/gui/spokes/oscap.py:784 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 +-#: ../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:792 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 +-#: ../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:800 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 +-#: ../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:808 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 +-#: ../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:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 +-#: ../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:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 +-#: ../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:843 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 +-#: ../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:859 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 +-#: ../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:890 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 +-#: ../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:894 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 +-#: ../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:1032 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 +-#: ../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:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 +-#: ../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:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 +-#: ../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:1056 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 +-#: ../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:1058 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 +-#: ../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:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 +-#: ../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:1140 tmp/oscap.glade.h:13 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 +-#: ../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 2020-07-09 17:56:19.314126529 +0200 +@@ -0,0 +1,301 @@ ++# Göran Uddeborg , 2019. #zanata ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"PO-Revision-Date: 2019-09-21 05:31-0400\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: Zanata 4.6.2\n" ++ ++#: ../org_fedora_oscap/rule_handling.py:409 ++#, python-brace-format ++msgid "" ++"{0} must be on a separate partition or logical volume and has to be created " ++"in the partitioning layout before installation can occur with a security " ++"profile" ++msgstr "" ++"{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 "" ++ ++#: ../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 2018-07-02 17:40:52.000000000 +0200 -+++ b/po/uk.po 2019-09-02 16:24:40.306145557 +0200 -@@ -1,33 +1,30 @@ +--- a/po/uk.po 2020-06-02 14:21:52.000000000 +0200 ++++ b/po/uk.po 2020-07-09 17:56:19.314126529 +0200 +@@ -1,11 +1,11 @@ # Yuri Chornoivan , 2015. -# Yuri Chornoivan , 2018. #zanata +# Yuri Chornoivan , 2015. #zanata @@ -4915,23 +5179,19 @@ diff -U3 -N -r a/po/uk.po b/po/uk.po msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2018-07-02 17:38+0200\n" +-"POT-Creation-Date: 2020-06-01 14:12+0200\n" -"PO-Revision-Date: 2018-07-02 03:40+0000\n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2015-08-31 03:22+0000\n" ++"POT-Creation-Date: 2020-07-09 17:35+0200\n" ++"PO-Revision-Date: 2015-08-31 03:22-0400\n" "Last-Translator: Yuri Chornoivan \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" --"Language: uk\n" + "Language: uk\n" +@@ -15,19 +15,16 @@ "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.4.5\n" -+"X-Generator: Zanata 4.6.2\n" + "X-Generator: Zanata 4.6.2\n" --#: ../org_fedora_oscap/rule_handling.py:392 -+#: ../org_fedora_oscap/rule_handling.py:398 +-#: ../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 " @@ -4943,29 +5203,29 @@ diff -U3 -N -r a/po/uk.po b/po/uk.po -"захисту" #. template for the message --#: ../org_fedora_oscap/rule_handling.py:403 -+#: ../org_fedora_oscap/rule_handling.py:409 +-#: ../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,86 +33,80 @@ +@@ -36,86 +33,88 @@ "«%(mount_option)s»" #. root password was not set --#: ../org_fedora_oscap/rule_handling.py:502 -+#: ../org_fedora_oscap/rule_handling.py:511 +-#: ../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:509 -+#: ../org_fedora_oscap/rule_handling.py:518 +-#: ../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:515 -+#: ../org_fedora_oscap/rule_handling.py:524 +-#: ../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 " @@ -4973,50 +5233,58 @@ diff -U3 -N -r a/po/uk.po b/po/uk.po msgstr "" -"пароль root є надто коротким, потрібен довший, принаймні із %d символів" --#: ../org_fedora_oscap/rule_handling.py:619 --#: ../org_fedora_oscap/rule_handling.py:634 -+#: ../org_fedora_oscap/rule_handling.py:628 -+#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../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:643 --#: ../org_fedora_oscap/rule_handling.py:658 -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 +-#: ../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:756 -+#: ../org_fedora_oscap/rule_handling.py:768 +-#: ../org_fedora_oscap/rule_handling.py:777 ++#: ../org_fedora_oscap/rule_handling.py:808 msgid "Kdump will be disabled on startup" -msgstr "Kdump буде вимкнено при запуску" +msgstr "" --#: ../org_fedora_oscap/rule_handling.py:758 -+#: ../org_fedora_oscap/rule_handling.py:770 +-#: ../org_fedora_oscap/rule_handling.py:779 ++#: ../org_fedora_oscap/rule_handling.py:810 msgid "Kdump will be enabled on startup" -msgstr "Kdump буде увімкнено при запуску" +msgstr "" --#: ../org_fedora_oscap/rule_handling.py:905 -+#: ../org_fedora_oscap/rule_handling.py:923 +-#: ../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:912 -+#: ../org_fedora_oscap/rule_handling.py:930 +-#: ../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:920 --#: ../org_fedora_oscap/rule_handling.py:957 -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 +-#: ../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 " @@ -5024,20 +5292,20 @@ diff -U3 -N -r a/po/uk.po b/po/uk.po msgstr "" -"службу «%s» було додано до списку служб, які слід додати до брандмауера" --#: ../org_fedora_oscap/rule_handling.py:927 --#: ../org_fedora_oscap/rule_handling.py:968 -+#: ../org_fedora_oscap/rule_handling.py:945 -+#: ../org_fedora_oscap/rule_handling.py:990 +-#: ../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:934 --#: ../org_fedora_oscap/rule_handling.py:979 -+#: ../org_fedora_oscap/rule_handling.py:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 +-#: ../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" @@ -5045,10 +5313,10 @@ diff -U3 -N -r a/po/uk.po b/po/uk.po -"запис довіри «%s» було додано до списку записів довіри, які слід додати до " -"брандмауера" --#: ../org_fedora_oscap/rule_handling.py:988 --#: ../org_fedora_oscap/rule_handling.py:1003 -+#: ../org_fedora_oscap/rule_handling.py:1015 -+#: ../org_fedora_oscap/rule_handling.py:1030 +-#: ../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 " @@ -5056,692 +5324,708 @@ diff -U3 -N -r a/po/uk.po b/po/uk.po msgstr "" -"службу «%s» було додано до списку служб, які слід вилучити з брандмауера" - #: ../org_fedora_oscap/ks/oscap.py:420 + #: ../org_fedora_oscap/ks/oscap.py:418 #, python-format -@@ -137,103 +128,109 @@ - "Встановлення слід перервати. Хочете продовжити його попри це?" +@@ -138,41 +137,41 @@ #. title of the spoke (will be displayed on the hub) --#: ../org_fedora_oscap/gui/spokes/oscap.py:196 + #: ../org_fedora_oscap/gui/spokes/oscap.py:198 -msgid "_SECURITY POLICY" -msgstr "П_РАВИЛА ЗАХИСТУ" -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 +msgid "_Security Policy" +msgstr "" #. the first status provided -#: ../org_fedora_oscap/gui/spokes/oscap.py:221 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:225 ++#: ../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:373 ++#: ../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:1042 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 +-#: ../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:645 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:646 msgid "No rules for the pre-installation phase" msgstr "Правил для кроку перед встановленням немає" --#: ../org_fedora_oscap/gui/spokes/oscap.py:784 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 +-#: ../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:792 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 +-#: ../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:800 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 +-#: ../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:808 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 +-#: ../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 "" -+"Під час спроби отримання даних сталася помилка, пов’язана із мережею. Будь " -+"ласка, перевірте, чи правильно налаштовано з’єднання, та чи є воно " -+"працездатним." +@@ -181,16 +180,16 @@ + "ласка, перевірте, чи правильно налаштовано з’єднання, та чи є воно " + "працездатним." --#: ../org_fedora_oscap/gui/spokes/oscap.py:817 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 +-#: ../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 "Дані не пройшли перевірку на цілісність. Їхнє використання неможливе." + msgstr "Дані не пройшли перевірку на цілісність. Їхнє використання неможливе." --#: ../org_fedora_oscap/gui/spokes/oscap.py:825 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 +-#: ../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:843 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 +-#: ../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 "" -+"Профіль з ідентифікатором «%s» у даних не визначено. Виберіть, будь ласка, " -+"інший профіль" +@@ -199,47 +198,47 @@ + "Профіль з ідентифікатором «%s» у даних не визначено. Виберіть, будь ласка, " + "інший профіль" --#: ../org_fedora_oscap/gui/spokes/oscap.py:859 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:872 +-#: ../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:890 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 +-#: ../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:894 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 +-#: ../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:1032 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1041 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1046 msgid "Error fetching and loading content" --msgstr "" -+msgstr "Помилка під час спроби отримання та завантаження даних" + msgstr "Помилка під час спроби отримання та завантаження даних" --#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 +-#: ../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:1050 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 +-#: ../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:1056 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 +-#: ../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:1058 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 +-#: ../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:1134 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 +-#: ../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:1140 tmp/oscap.glade.h:13 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 +-#: ../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 +286,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 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/zh_CN.po 2019-09-02 16:24:40.306145557 +0200 -@@ -0,0 +1,274 @@ -+# Ludek Janda , 2018. #zanata -+# Tony Fu , 2019. #zanata -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2019-08-27 04:16+0000\n" -+"Last-Translator: Tony Fu \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" -+ -+#: ../org_fedora_oscap/rule_handling.py:398 +--- a/po/zh_CN.po 2020-06-02 14:20:57.000000000 +0200 ++++ b/po/zh_CN.po 2020-07-09 17:56:19.314126529 +0200 +@@ -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 "" -+"{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} 必须在一个独立的分区或逻辑卷上，并需要在带有安全档案的安装进行前，在分区布局中创建" ++"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}' 已被添加到排除的软件包列表中，但在不破坏安装的情况下，无法从当前的软件选择中删除。" + -+#. template for the message -+#: ../org_fedora_oscap/rule_handling.py:409 -+#, 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:511 -+#, python-format -+msgid "make sure to create password with minimal length of %d characters" -+msgstr "确保创建的密码长度最少为 %d 个字符" -+ -+#: ../org_fedora_oscap/rule_handling.py:518 -+msgid "cannot check root password length (password is crypted)" -+msgstr "无法检查 root 密码的长度（密码已加密）" -+ -+#. too short -+#: ../org_fedora_oscap/rule_handling.py:524 -+#, 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:628 -+#: ../org_fedora_oscap/rule_handling.py:643 -+#, python-format -+msgid "package '%s' has been added to the list of to be installed packages" -+msgstr "软件包 '%s' 已被添加到要被安装的软件包列表中" -+ -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 -+#, python-format -+msgid "package '%s' has been added to the list of excluded packages" -+msgstr "软件包 '%s' 已被添加到排除的软件包列表中" -+ -+#: ../org_fedora_oscap/rule_handling.py:768 -+msgid "Kdump will be disabled on startup" -+msgstr "Kdump 将在启动时被禁用" -+ -+#: ../org_fedora_oscap/rule_handling.py:770 -+msgid "Kdump will be enabled on startup" -+msgstr "Kdump 将在启动时被启用" -+ -+#: ../org_fedora_oscap/rule_handling.py:923 -+msgid "Firewall will be disabled on startup" -+msgstr "防火墙将在启动时被禁用" -+ -+#: ../org_fedora_oscap/rule_handling.py:930 -+msgid "Firewall will be enabled on startup" -+msgstr "防火墙将在启动时被启用" -+ -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 -+#, 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:945 -+#: ../org_fedora_oscap/rule_handling.py:990 -+#, 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:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 -+#, 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:1015 ++#: ../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 "" -+"service '%s' has been added to the list of services to be removed from the " -+"firewall" -+msgstr "服务 '%s' 已被添加到要从防火墙删除的服务列表中" -+ -+#: ../org_fedora_oscap/ks/oscap.py:420 -+#, python-format -+msgid "" -+"There was an error fetching and loading the security content:\n" -+"%s\n" -+"The installation should be aborted. Do you wish to continue anyway?" -+msgstr "" -+"在获取和加载安全内容时出错：\n" -+"%s\n" -+"安装应该被终止。您希望继续吗？" -+ -+#: ../org_fedora_oscap/ks/oscap.py:449 -+msgid "" -+"The integrity check of the security content failed.\n" -+"The installation should be aborted. Do you wish to continue anyway?" -+msgstr "" -+"对安全内容的完整性检查失败。\n" -+"安装应该被终止。您希望继续吗？" -+ -+#. title of the spoke (will be displayed on the hub) -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 + #, 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:225 -+msgid "Not ready" -+msgstr "未就绪" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:373 -+msgid "Fetching content data" -+msgstr "获取内容数据" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+msgid "No profile selected" -+msgstr "没有选择 profile" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:645 -+msgid "No rules for the pre-installation phase" -+msgstr "没有预安装阶段的规则" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 -+msgid "Invalid content provided. Enter a different URL, please." -+msgstr "提供无效的内容。请输入一个不同的 URL。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 -+msgid "Invalid or unsupported content URL, please enter a different one." -+msgstr "无效或不支持的内容 URL，请输入一个不同的 URL。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 -+msgid "Failed to fetch content. Enter a different URL, please." -+msgstr "获取内容失败。请输入一个不同的 URL。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 -+msgid "" -+"Network error encountered when fetching data. Please check that network is " -+"setup and working." -+msgstr "在获取数据时出现网络错误。请检查网络是否正常。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 -+msgid "The integrity check of the content failed. Cannot use the content." -+msgstr "内容的完整性检查失败。不能使用这个内容。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 -+#, python-format -+msgid "Failed to extract content (%s). Enter a different URL, please." -+msgstr "提取内容 (%s) 失败。请输入一个不同的 URL。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 -+#, 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:872 -+msgid "Not applying security policy" -+msgstr "没有应用安全策略" -+ -+#. TRANSLATORS: the other choice if SCAP Security Guide is also -+#. available -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+msgid " or enter data stream content or archive URL below:" -+msgstr "或输入数据流内容或归档 URL：" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 -+msgid "" -+"No content found. Please enter data stream content or archive URL below:" -+msgstr "没有找到内容。请输入数据流或归档 URL：" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 -+msgid "Error fetching and loading content" -+msgstr "获取并加载内容错误" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 -+msgid "No content found" -+msgstr "没有找到内容" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 -+msgid "Misconfiguration detected" -+msgstr "发现错误配置" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 -+msgid "Warnings appeared" -+msgstr "出现的警告" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 -+msgid "Everything okay" -+msgstr "一切正常" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 -+msgid "Invalid or unsupported URL" -+msgstr "无效或不支持的 URL" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 -+msgid "Fetching content..." -+msgstr "获取内容..." -+ -+#: tmp/oscap.glade.h:1 -+msgid "SECURITY POLICY" -+msgstr "安全策略" -+ -+#: tmp/oscap.glade.h:2 -+msgid "_Change content" -+msgstr "修改内容(_C)" -+ -+#: tmp/oscap.glade.h:3 -+msgid "Apply security policy:" -+msgstr "应用安全策略：" -+ -+#: tmp/oscap.glade.h:4 -+msgid "Data stream:" -+msgstr "数据流：" -+ -+#: tmp/oscap.glade.h:5 -+msgid "Checklist:" -+msgstr "检查列表：" -+ -+#: tmp/oscap.glade.h:6 -+msgid "Choose profile below:" -+msgstr "选择档案：" -+ -+#: tmp/oscap.glade.h:7 -+msgid "Profile" -+msgstr "档案" -+ -+#: tmp/oscap.glade.h:8 -+msgid "Selected" -+msgstr "选择" -+ -+#: tmp/oscap.glade.h:9 -+msgid "_Select profile" -+msgstr "选择档案(_S)" -+ -+#: tmp/oscap.glade.h:10 -+msgid "Changes that were done or need to be done:" -+msgstr "已完成或需要完成的改变" -+ -+#: tmp/oscap.glade.h:11 -+msgid "_Use SCAP Security Guide" -+msgstr "使用 SCAP 安全指南(_U)" -+ -+#: tmp/oscap.glade.h:12 -+msgid "_Fetch" -+msgstr "获取(_F)" ++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 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/zh_TW.po 2019-09-02 16:24:40.306145557 +0200 -@@ -0,0 +1,268 @@ -+# Ludek Janda , 2019. #zanata -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2019-08-26 14:16+0200\n" -+"PO-Revision-Date: 2019-08-30 10:56+0000\n" +--- a/po/zh_TW.po 2020-06-02 14:20:58.000000000 +0200 ++++ b/po/zh_TW.po 2020-07-09 17:56:19.314126529 +0200 +@@ -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" -+"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" -+ -+#: ../org_fedora_oscap/rule_handling.py:398 + "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 "" -+"{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} 必須位於單獨的分區或邏輯卷上，並且必須在分區佈局中創建，然後才能使用安全配置文件進行安裝" ++"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 "" + -+#. template for the message -+#: ../org_fedora_oscap/rule_handling.py:409 -+#, 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:511 -+#, python-format -+msgid "make sure to create password with minimal length of %d characters" -+msgstr "確保以最小的長度創建密碼 %d 人物" -+ -+#: ../org_fedora_oscap/rule_handling.py:518 -+msgid "cannot check root password length (password is crypted)" -+msgstr "無法檢查root密碼長度（密碼被加密）" -+ -+#. too short -+#: ../org_fedora_oscap/rule_handling.py:524 -+#, 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:628 -+#: ../org_fedora_oscap/rule_handling.py:643 -+#, python-format -+msgid "package '%s' has been added to the list of to be installed packages" -+msgstr "包'%s'已添加到要安裝的軟件包列表中" -+ -+#: ../org_fedora_oscap/rule_handling.py:652 -+#: ../org_fedora_oscap/rule_handling.py:667 -+#, python-format -+msgid "package '%s' has been added to the list of excluded packages" -+msgstr "包'%s'已添加到已排除的包列表中" -+ -+#: ../org_fedora_oscap/rule_handling.py:768 -+msgid "Kdump will be disabled on startup" -+msgstr "Kdump將在啟動時被禁用" -+ -+#: ../org_fedora_oscap/rule_handling.py:770 -+msgid "Kdump will be enabled on startup" -+msgstr "Kdump將在啟動時啟用" -+ -+#: ../org_fedora_oscap/rule_handling.py:923 -+msgid "Firewall will be disabled on startup" -+msgstr "防火牆將在啟動時禁用" -+ -+#: ../org_fedora_oscap/rule_handling.py:930 -+msgid "Firewall will be enabled on startup" -+msgstr "防火牆將在啟動時啟用" -+ -+#: ../org_fedora_oscap/rule_handling.py:938 -+#: ../org_fedora_oscap/rule_handling.py:977 -+#, 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:945 -+#: ../org_fedora_oscap/rule_handling.py:990 -+#, 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:952 -+#: ../org_fedora_oscap/rule_handling.py:1003 -+#, 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:1015 ++#: ../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 "" -+"service '%s' has been added to the list of services to be removed from the " -+"firewall" -+msgstr "服務'%s'已被添加到要從防火牆中刪除的服務列表中" -+ -+#: ../org_fedora_oscap/ks/oscap.py:420 -+#, python-format -+msgid "" -+"There was an error fetching and loading the security content:\n" -+"%s\n" -+"The installation should be aborted. Do you wish to continue anyway?" -+msgstr "獲取和加載安全內容時出錯：%s安裝應該中止。你想繼續嗎？" -+ -+#: ../org_fedora_oscap/ks/oscap.py:449 -+msgid "" -+"The integrity check of the security content failed.\n" -+"The installation should be aborted. Do you wish to continue anyway?" -+msgstr "安全內容的完整性檢查失敗。安裝應該中止。你想繼續嗎？" -+ -+#. title of the spoke (will be displayed on the hub) -+#: ../org_fedora_oscap/gui/spokes/oscap.py:198 + #, 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:225 -+msgid "Not ready" -+msgstr "沒有準備好" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:373 -+msgid "Fetching content data" -+msgstr "獲取內容數據" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:640 -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1055 -+msgid "No profile selected" -+msgstr "沒有選擇個人資料" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:645 -+msgid "No rules for the pre-installation phase" -+msgstr "沒有預安裝階段的規則" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:797 -+msgid "Invalid content provided. Enter a different URL, please." -+msgstr "提供的內容無效。請輸入其他網址。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:805 -+msgid "Invalid or unsupported content URL, please enter a different one." -+msgstr "無效或不受支持的內容網址，請輸入其他網址。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:813 -+msgid "Failed to fetch content. Enter a different URL, please." -+msgstr "無法獲取內容。請輸入其他網址。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:821 -+msgid "" -+"Network error encountered when fetching data. Please check that network is " -+"setup and working." -+msgstr "獲取數據時遇到網絡錯誤。請檢查網絡是否已設置並正常運行。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:830 -+msgid "The integrity check of the content failed. Cannot use the content." -+msgstr "內容的完整性檢查失敗。無法使用內容。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:838 -+#, python-format -+msgid "Failed to extract content (%s). Enter a different URL, please." -+msgstr "無法提取內容（%s）。請輸入其他網址。" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:856 -+#, 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:872 -+msgid "Not applying security policy" -+msgstr "不應用安全策略" -+ -+#. TRANSLATORS: the other choice if SCAP Security Guide is also -+#. available -+#: ../org_fedora_oscap/gui/spokes/oscap.py:903 -+msgid " or enter data stream content or archive URL below:" -+msgstr " 或輸入以下數據流內容或存檔URL：" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:907 -+msgid "" -+"No content found. Please enter data stream content or archive URL below:" -+msgstr "找不到任何內容。請在下面輸入數據流內容或存檔URL：" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1045 -+msgid "Error fetching and loading content" -+msgstr "獲取和加載內容時出錯" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1052 -+msgid "No content found" -+msgstr "找不到任何內容" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1063 -+msgid "Misconfiguration detected" -+msgstr "檢測到配置錯誤" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1069 -+msgid "Warnings appeared" -+msgstr "警告出現了" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1071 -+msgid "Everything okay" -+msgstr "一切都好" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1147 -+msgid "Invalid or unsupported URL" -+msgstr "網址無效或不受支持" -+ -+#: ../org_fedora_oscap/gui/spokes/oscap.py:1153 tmp/oscap.glade.h:13 -+msgid "Fetching content..." -+msgstr "獲取內容......" -+ -+#: tmp/oscap.glade.h:1 -+msgid "SECURITY POLICY" -+msgstr "安全政策" -+ -+#: tmp/oscap.glade.h:2 -+msgid "_Change content" -+msgstr "改變內容（_C）" -+ -+#: tmp/oscap.glade.h:3 -+msgid "Apply security policy:" -+msgstr "應用安全策略：" -+ -+#: tmp/oscap.glade.h:4 -+msgid "Data stream:" -+msgstr "數據流：" -+ -+#: tmp/oscap.glade.h:5 -+msgid "Checklist:" -+msgstr "清單：" -+ -+#: tmp/oscap.glade.h:6 -+msgid "Choose profile below:" -+msgstr "選擇以下資料：" -+ -+#: tmp/oscap.glade.h:7 -+msgid "Profile" -+msgstr "輪廓" -+ -+#: tmp/oscap.glade.h:8 -+msgid "Selected" -+msgstr "選" -+ -+#: tmp/oscap.glade.h:9 -+msgid "_Select profile" -+msgstr "選擇個人資料（_S）" -+ -+#: tmp/oscap.glade.h:10 -+msgid "Changes that were done or need to be done:" -+msgstr "已完成或需要完成的更改：" -+ -+#: tmp/oscap.glade.h:11 -+msgid "_Use SCAP Security Guide" -+msgstr "_使用SCAP安全指南（_U）" -+ -+#: tmp/oscap.glade.h:12 -+msgid "_Fetch" -+msgstr "取（_F）" + 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 new file mode 100644 index 0000000..9221ade --- /dev/null +++ b/SOURCES/oaa-1.2-unicode_issues_PR124.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 0000000..35e4e6e --- /dev/null +++ b/SOURCES/oaa-1.2_lang-streamline.patch @@ -0,0 +1,101 @@ +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 new file mode 100644 index 0000000..b61bcb9 --- /dev/null +++ b/SOURCES/oaa-1.2_spoke-window_PR122.patch @@ -0,0 +1,41 @@ +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 new file mode 100644 index 0000000..dbcdaf6 --- /dev/null +++ b/SOURCES/oaa-1.2_warn-nfs-utils.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 0000000..b7bfeb3 --- /dev/null +++ b/SOURCES/oaa-1.2_warn-xorg.patch @@ -0,0 +1,82 @@ +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/oaa-api-update.patch b/SOURCES/oaa-api-update.patch deleted file mode 100644 index 8edb64e..0000000 --- a/SOURCES/oaa-api-update.patch +++ /dev/null @@ -1,256 +0,0 @@ -diff --git a/org_fedora_oscap/rule_handling.py b/org_fedora_oscap/rule_handling.py -index f712ac4..738465f 100644 ---- a/org_fedora_oscap/rule_handling.py -+++ b/org_fedora_oscap/rule_handling.py -@@ -26,7 +26,13 @@ - import optparse - import shlex - import logging -+ - from pyanaconda.pwpolicy import F22_PwPolicyData -+from pyanaconda.core.constants import ( -+ FIREWALL_ENABLED, FIREWALL_DISABLED, FIREWALL_USE_SYSTEM_DEFAULTS) -+from pyanaconda.modules.common.constants.objects import FIREWALL, BOOTLOADER -+from pyanaconda.modules.common.constants.services import NETWORK, STORAGE, USERS -+ - from org_fedora_oscap import common - from org_fedora_oscap.common import OSCAPaddonError, RuleMessage - -@@ -496,7 +502,10 @@ def eval_rules(self, ksdata, storage, report_only=False): - return [] - - ret = [] -- if not ksdata.rootpw.password: -+ -+ users_proxy = USERS.get_proxy() -+ -+ if not users_proxy.IsRootPasswordSet: - # root password was not set - - msg = _("make sure to create password with minimal length of %d " -@@ -505,12 +514,12 @@ def eval_rules(self, ksdata, storage, report_only=False): - common.MESSAGE_TYPE_WARNING, msg)] - else: - # root password set -- if ksdata.rootpw.isCrypted: -+ if users_proxy.IsRootPasswordCrypted: - msg = _("cannot check root password length (password is crypted)") - log.warning("cannot check root password length (password is crypted)") - return [RuleMessage(self.__class__, - common.MESSAGE_TYPE_WARNING, msg)] -- elif len(ksdata.rootpw.password) < self._minlen: -+ elif len(users_proxy.RootPassword) < self._minlen: - # too short - msg = _("root password is too short, a longer one with at " - "least %d characters is required") % self._minlen -@@ -705,10 +714,13 @@ def __str__(self): - def eval_rules(self, ksdata, storage, report_only=False): - """:see: RuleHandler.eval_rules""" - -- if self._require_password and not storage.bootloader.password: -- # Anaconda doesn't provide a way to set bootloader password, so -- # users cannot do much about that --> we shouldn't stop the -- # installation, should we? -+ bootloader_proxy = STORAGE.get_proxy(BOOTLOADER) -+ -+ if self._require_password and not bootloader_proxy.password_is_set: -+ # TODO: Anaconda provides a way to set bootloader password: -+ # bootloader_proxy.set_password(...) -+ # We don't support setting the bootloader password yet, -+ # but we shouldn't stop the installation, just because of that. - return [RuleMessage(self.__class__, common.MESSAGE_TYPE_WARNING, - "boot loader password not set up")] - else: -@@ -802,8 +814,13 @@ def __init__(self): - self._added_trusts = set() - self._removed_svcs = set() - -+ self._new_services_to_add = set() -+ self._new_ports_to_add = set() -+ self._new_trusts_to_add = set() -+ self._new_services_to_remove = set() -+ - self._firewall_enabled = None -- self._firewall_default_enabled = None -+ self._firewall_default_state = None - - def add_services(self, services): - """ -@@ -895,25 +912,26 @@ def __str__(self): - def eval_rules(self, ksdata, storage, report_only=False): - """:see: RuleHandler.eval_rules""" - -+ firewall_proxy = NETWORK.get_proxy(FIREWALL) - messages = [] - -- if self._firewall_default_enabled is None: -+ if self._firewall_default_state is None: - # firewall default startup setting -- self._firewall_default_enabled = ksdata.firewall.enabled -+ self._firewall_default_state = firewall_proxy.FirewallMode - - if self._firewall_enabled is False: - msg = _("Firewall will be disabled on startup") - messages.append(RuleMessage(self.__class__, - common.MESSAGE_TYPE_INFO, msg)) - if not report_only: -- ksdata.firewall.enabled = self._firewall_enabled -+ firewall_proxy.SetFirewallMode(FIREWALL_DISABLED) - - elif self._firewall_enabled is True: - msg = _("Firewall will be enabled on startup") - messages.append(RuleMessage(self.__class__, - common.MESSAGE_TYPE_INFO, msg)) - if not report_only: -- ksdata.firewall.enabled = self._firewall_enabled -+ firewall_proxy.SetFirewallMode(FIREWALL_ENABLED) - - # add messages for the already added services - for svc in self._added_svcs: -@@ -937,49 +955,58 @@ def eval_rules(self, ksdata, storage, report_only=False): - common.MESSAGE_TYPE_INFO, msg)) - - # services, that should be added -- services_to_add = (svc for svc in self._add_svcs -- if svc not in ksdata.firewall.services) -+ self._new_services_to_add = { -+ svc for svc in self._add_svcs -+ if svc not in firewall_proxy.EnabledServices} - - # ports, that should be added -- ports_to_add = (ports for ports in self._add_ports -- if ports not in ksdata.firewall.ports) -+ self._new_ports_to_add = { -+ ports for ports in self._add_ports -+ if ports not in firewall_proxy.EnabledPorts} - - # trusts, that should be added -- trusts_to_add = (trust for trust in self._add_trusts -- if trust not in ksdata.firewall.trusts) -+ self._new_trusts_to_add = { -+ trust for trust in self._add_trusts -+ if trust not in firewall_proxy.Trusts} - -- for svc in services_to_add: -+ for svc in self._new_services_to_add: - # add the service unless already added - if not report_only: - self._added_svcs.add(svc) -- ksdata.firewall.services.append(svc) - - msg = _("service '%s' has been added to the list of services to be " - "added to the firewall" % svc) - messages.append(RuleMessage(self.__class__, - common.MESSAGE_TYPE_INFO, msg)) -+ if not report_only: -+ all_services = list(self._add_svcs.union(set(firewall_proxy.EnabledServices))) -+ firewall_proxy.SetEnabledServices(all_services) - -- for port in ports_to_add: -+ for port in self._new_ports_to_add: - # add the port unless already added - if not report_only: - self._added_ports.add(port) -- ksdata.firewall.ports.append(port) - - msg = _("port '%s' has been added to the list of ports to be " - "added to the firewall" % port) - messages.append(RuleMessage(self.__class__, - common.MESSAGE_TYPE_INFO, msg)) -+ if not report_only: -+ all_ports = list(self._add_ports.union(set(firewall_proxy.EnabledPorts))) -+ firewall_proxy.SetEnabledPorts(all_ports) - -- for trust in trusts_to_add: -+ for trust in self._new_trusts_to_add: - # add the trust unless already added - if not report_only: - self._added_trusts.add(trust) -- ksdata.firewall.trusts.append(trust) - - msg = _("trust '%s' has been added to the list of trusts to be " - "added to the firewall" % trust) - messages.append(RuleMessage(self.__class__, - common.MESSAGE_TYPE_INFO, msg)) -+ if not report_only: -+ all_trusts = list(self._add_trusts.union(set(firewall_proxy.Trusts))) -+ firewall_proxy.SetTrusts(all_trusts) - - # now do the same for the services that should be excluded - -@@ -990,52 +1017,56 @@ def eval_rules(self, ksdata, storage, report_only=False): - messages.append(RuleMessage(self.__class__, - common.MESSAGE_TYPE_INFO, msg)) - -- # services, that should be added -- services_to_remove = (svc for svc in self._remove_svcs -- if svc not in ksdata.firewall.remove_services) -+ # services, that should be excluded -+ self._new_services_to_remove = { -+ svc for svc in self._remove_svcs -+ if svc not in firewall_proxy.DisabledServices} - -- for svc in services_to_remove: -+ for svc in self._new_services_to_remove: - # exclude the service unless already excluded - if not report_only: - self._removed_svcs.add(svc) -- ksdata.firewall.remove_services.append(svc) - - msg = _("service '%s' has been added to the list of services to be " - "removed from the firewall" % svc) - messages.append(RuleMessage(self.__class__, - common.MESSAGE_TYPE_INFO, msg)) -+ if not report_only: -+ all_services = list(self._remove_svcs.union(set(firewall_proxy.DisabledServices))) -+ firewall_proxy.SetDisabledServices(all_services) - - return messages - - def revert_changes(self, ksdata, storage): - """:see: RuleHander.revert_changes""" -+ firewall_proxy = NETWORK.get_proxy(FIREWALL) - - if self._firewall_enabled is not None: -- ksdata.firewall.enabled = self._firewall_default_enabled -+ firewall_proxy.SetFirewallMode(self._firewall_default_state) - - # remove all services this handler added -- for svc in self._added_svcs: -- if svc in ksdata.firewall.services: -- ksdata.firewall.services.remove(svc) -+ all_services = firewall_proxy.EnabledServices -+ orig_services = set(all_services).difference(self._new_services_to_add) -+ firewall_proxy.SetEnabledServices(list(orig_services)) - - # remove all ports this handler added -- for port in self._added_ports: -- if port in ksdata.firewall.ports: -- ksdata.firewall.ports.remove(port) -+ all_ports = firewall_proxy.EnabledPorts -+ orig_ports = set(all_ports).difference(self._new_ports_to_add) -+ firewall_proxy.SetEnabledPorts(list(orig_ports)) - - # remove all trusts this handler added -- for trust in self._added_trusts: -- if trust in ksdata.firewall.trusts: -- ksdata.firewall.trusts.remove(trust) -+ all_trusts = firewall_proxy.Trusts -+ orig_trusts = set(all_trusts).difference(self._new_trusts_to_add) -+ firewall_proxy.SetTrusts(list(orig_trusts)) - - # remove all services this handler excluded -- for svc in self._removed_svcs: -- if svc in ksdata.firewall.remove_services: -- ksdata.firewall.remove_services.remove(svc) -+ all_services = firewall_proxy.DisabledServices -+ orig_services = set(all_services).difference(self._new_services_to_remove) -+ firewall_proxy.SetDisabledServices(list(orig_services)) - - self._added_svcs = set() - self._added_ports = set() - self._added_trusts = set() - self._removed_svcs = set() - self._firewall_enabled = None -- self._firewall_default_enabled = None -+ self._firewall_default_state = None diff --git a/SOURCES/rootpw.patch b/SOURCES/rootpw.patch deleted file mode 100644 index 8bd3dc4..0000000 --- a/SOURCES/rootpw.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 44a643f4c115d638d42f19f668cef1c220aab1b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Thu, 17 Jan 2019 18:06:02 +0100 -Subject: [PATCH] Updated the code to use the up-to-date Anaconda API. - -Fixes RHBZ#1665551 ---- - org_fedora_oscap/gui/spokes/oscap.py | 29 +++++++++++++++++++--------- - 1 file changed, 20 insertions(+), 9 deletions(-) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index 36fd656..f16699b 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -38,6 +38,8 @@ - from pyanaconda.ui.categories.system import SystemCategory - from pykickstart.errors import KickstartValueError - -+from pyanaconda.modules.common.constants.services import USERS -+ - # pylint: disable-msg=E0611 - from gi.repository import Gdk - -@@ -650,26 +652,35 @@ def _update_message_store(self, report_only=False): - - def _resolve_rootpw_issues(self, messages, report_only): - """Mitigate root password issues (which are not fatal in GUI)""" -- fatal_rootpw_msgs = [msg for msg in messages -- if msg.origin == rule_handling.PasswdRules and msg.type == common.MESSAGE_TYPE_FATAL] -+ fatal_rootpw_msgs = [ -+ msg for msg in messages -+ if msg.origin == rule_handling.PasswdRules and msg.type == common.MESSAGE_TYPE_FATAL] -+ - if fatal_rootpw_msgs: - for msg in fatal_rootpw_msgs: - # cannot just change the message type because it is a namedtuple - messages.remove(msg) -- messages.append(common.RuleMessage(self.__class__, -- common.MESSAGE_TYPE_WARNING, -- msg.text)) -+ -+ msg = common.RuleMessage( -+ self.__class__, common.MESSAGE_TYPE_WARNING, msg.text) -+ messages.append(msg) -+ - if not report_only: -- self.__old_root_pw = self.data.rootpw.password -+ users_proxy = USERS.get_proxy() -+ -+ self.__old_root_pw = users_proxy.RootPassword - self.data.rootpw.password = None -- self.__old_root_pw_seen = self.data.rootpw.seen -+ self.__old_root_pw_seen = users_proxy.IsRootpwKickstarted - self.data.rootpw.seen = False - - def _revert_rootpw_changes(self): - if self.__old_root_pw is not None: -- self.data.rootpw.password = self.__old_root_pw -- self.data.rootpw.seen = self.__old_root_pw_seen -+ users_proxy = USERS.get_proxy() -+ -+ users_proxy.SetRootPassword(self.__old_root_pw) - self.__old_root_pw = None -+ -+ users_proxy.SetRootpwKickstarted(self.__old_root_pw_seen) - self.__old_root_pw_seen = None - - @async_action_wait diff --git a/SOURCES/translate_spoke_title.patch b/SOURCES/translate_spoke_title.patch deleted file mode 100644 index 7194f00..0000000 --- a/SOURCES/translate_spoke_title.patch +++ /dev/null @@ -1,22 +0,0 @@ -From c88dba4b9deeb78158bf2e239e4b7118a9e8b39f Mon Sep 17 00:00:00 2001 -From: Marek Haicman -Date: Thu, 7 Feb 2019 19:24:08 +0100 -Subject: [PATCH] Hack hub title to show translated. - ---- - org_fedora_oscap/gui/spokes/oscap.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py -index 72c1501..594969a 100644 ---- a/org_fedora_oscap/gui/spokes/oscap.py -+++ b/org_fedora_oscap/gui/spokes/oscap.py -@@ -190,6 +190,8 @@ def __init__(self, data, storage, payload, instclass): - - NormalSpoke.__init__(self, data, storage, payload, instclass) - self._addon_data = self.data.addons.org_fedora_oscap -+ # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1673071 -+ self.title = _(self.title) - self._storage = storage - self._ready = False - diff --git a/SPECS/oscap-anaconda-addon.spec b/SPECS/oscap-anaconda-addon.spec index 0adfaee..6c6daa5 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.0 -Release: 10%{?dist} +Version: 1.1.1 +Release: 5%{?dist} Summary: Anaconda addon integrating OpenSCAP to the installation process License: GPLv2+ @@ -16,25 +16,22 @@ URL: https://github.com/OpenSCAP/oscap-anaconda-addon # or via direct git checkout: # git clone https://github.com/OpenSCAP/oscap-anaconda-addon.git Source0: %{name}-%{version}.tar.gz + +# Let the Patch1 be reserved for translations patches Patch1: lang.patch -Patch2: oaa-api-update.patch -Patch3: help_id.patch -Patch4: rootpw.patch -Patch5: bootloader.patch -Patch6: checksum.patch -Patch7: translate_spoke_title.patch -Patch8: do_not_use_capitals_for_the_spoke_title.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 BuildArch: noarch BuildRequires: gettext BuildRequires: python3-devel BuildRequires: python3-pycurl -#BuildRequires: python-mock -#BuildRequires: python-nose -#BuildRequires: python3-cpio BuildRequires: openscap openscap-utils openscap-python3 -BuildRequires: anaconda-core >= 28.22.10 -Requires: anaconda-core >= 28.22.10 +BuildRequires: anaconda-core >= 33 +Requires: anaconda-core >= 33 Requires: python3-cpio Requires: python3-pycurl Requires: python3-kickstart @@ -54,11 +51,14 @@ content. %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p1 -# As Patch1 translates the upsated string "_Security Policy" added by Patch8, -# Patch1 needs to be aplied after Patch8 + +# As patches may translates the strings that are updated by later patches, +# Patch1 needs to be aplied last. %patch1 -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. +# This has consulted with ljanda@redhat.com, and we basically follow the existing practice of the Anaconda project we integrate into. %build @@ -76,6 +76,25 @@ make install DESTDIR=%{buildroot} %doc COPYING ChangeLog README.md %changelog +* Tue Aug 18 2020 Matěj Týč - 1.1.1-5 +- Fixed issues with encountering filenames with weird encoding during scans - rhbz#1867960 + +* Thu Jul 09 2020 Matěj Týč - 1.1.1-4 +- Fixed spoke window text: RHBZ#1855041 + +* Fri Jun 26 2020 Matěj Týč - 1.1.1-3 +- Updated translations: RHBZ#1820557 + +* Mon Jun 22 2020 Matěj Týč - 1.1.1-2 +- Fixed issues addressing combination of profiles and GUI-based software selections: RHBZ#1843932, RHBZ#1787156 +- Improved handling of languages, capitalization: RHBZ#1696278 +- Updated translations: RHBZ#1820557 + +* Tue Jun 02 2020 Matěj Týč - 1.1.1-1 +- Rebase to upstream 1.1.1 +- This OAA is compatible with the RHEL 8.3 Anaconda: RHBZ#1696278 +- The UX has been improved: RHBZ#1781790 + * Mon Sep 02 2019 Watson Sato - 1.0-10 - Do not use capital letters for spoke title: RHBZ#1744185 - Updated translations