commit 593fdb986c9a2b6f5734be49a25b065679777d4b Author: CentOS Sources Date: Tue May 7 06:01:12 2019 -0400 import oscap-anaconda-addon-1.0-9.el8 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e2ae30b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/oscap-anaconda-addon-1.0.tar.gz diff --git a/.oscap-anaconda-addon.metadata b/.oscap-anaconda-addon.metadata new file mode 100644 index 0000000..a62afda --- /dev/null +++ b/.oscap-anaconda-addon.metadata @@ -0,0 +1 @@ +6edf7e4859de8e66837404c084405ea4318a319d SOURCES/oscap-anaconda-addon-1.0.tar.gz diff --git a/SOURCES/bootloader.patch b/SOURCES/bootloader.patch new file mode 100644 index 0000000..12a3f28 --- /dev/null +++ b/SOURCES/bootloader.patch @@ -0,0 +1,26 @@ +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 new file mode 100644 index 0000000..0952771 --- /dev/null +++ b/SOURCES/checksum.patch @@ -0,0 +1,30 @@ +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/help_id.patch b/SOURCES/help_id.patch new file mode 100644 index 0000000..c4b96e0 --- /dev/null +++ b/SOURCES/help_id.patch @@ -0,0 +1,30 @@ +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 new file mode 100644 index 0000000..75caee7 --- /dev/null +++ b/SOURCES/lang.patch @@ -0,0 +1,4612 @@ +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 1970-01-01 01:00:00.000000000 +0100 +@@ -1,288 +0,0 @@ +-# SOME DESCRIPTIVE TITLE. +-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +-# This file is distributed under the same license as the PACKAGE package. +-# +-# Translators: +-# Robert Antoni Buj i Gelonch , 2015 +-# Ding-Yi Chen , 2015. #zanata +-# Robert Antoni Buj Gelonch , 2015. #zanata +-msgid "" +-msgstr "" +-"Project-Id-Version: PACKAGE VERSION\n" +-"Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2018-07-02 17:38+0200\n" +-"PO-Revision-Date: 2015-09-29 07:30+0000\n" +-"Last-Translator: Robert Antoni Buj Gelonch \n" +-"Language-Team: Catalan (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/ca/)\n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" +-"Language: ca\n" +-"Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Zanata 4.4.5\n" +- +-#: ../org_fedora_oscap/rule_handling.py:392 +-#, python-brace-format +-msgid "" +-"{0} must be on a separate partition or logical volume and has to be created " +-"in the partitioning layout before installation can occur with a security " +-"profile" +-msgstr "" +- +-#. template for the message +-#: ../org_fedora_oscap/rule_handling.py:403 +-#, python-format +-msgid "" +-"mount option '%(mount_option)s' added for the mount point %(mount_point)s" +-msgstr "" +-"l'opció de muntatge '%(mount_option)s' va afegir-se al punt de muntatge " +-"%(mount_point)s" +- +-#. root password was not set +-#: ../org_fedora_oscap/rule_handling.py:502 +-#, 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 +-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 +-#, 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 +-#, 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 +-#, 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 +-msgid "Kdump will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:758 +-msgid "Kdump will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:905 +-msgid "Firewall will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:912 +-msgid "Firewall will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:920 +-#: ../org_fedora_oscap/rule_handling.py:957 +-#, 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 +-#, 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 +-#, 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 +-#, 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 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +- +-#: ../org_fedora_oscap/ks/oscap.py: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:196 +-msgid "_SECURITY POLICY" +-msgstr "PERFIL DE _SEGURETAT" +- +-#. the first status provided +-#: ../org_fedora_oscap/gui/spokes/oscap.py:221 +-msgid "Not ready" +-msgstr "No està llest" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:369 +-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 +-msgid "No profile selected" +-msgstr "No s'ha seleccionat cap perfil" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-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 +-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 +-msgid "Invalid or unsupported content URL, please enter a different one." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:800 +-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 +-msgid "" +-"Network error encountered when fetching data. Please check that network is " +-"setup and working." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:817 +-msgid "The integrity check of the content failed. Cannot use the content." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:825 +-#, 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 +-#, 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 +-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 +-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 +-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 +-msgid "Error fetching and loading content" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 +-msgid "No content found" +-msgstr "No s'ha trobat cap contingut" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 +-msgid "Misconfiguration detected" +-msgstr "S'ha detectat una configuració errònia" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-msgid "Warnings appeared" +-msgstr "Advertències que van aparèixer" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 +-msgid "Everything okay" +-msgstr "Tot està bé" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 +-msgid "Invalid or unsupported URL" +-msgstr "L'URL no és vàlid o no està admès" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:13 +-msgid "Fetching content..." +-msgstr "S'està obtenint el contingut..." +- +-#: tmp/oscap.glade.h:1 +-msgid "SECURITY POLICY" +-msgstr "POLÍTICA DE SEGURETAT" +- +-#: tmp/oscap.glade.h:2 +-msgid "_Change content" +-msgstr "_Canvia el contingut" +- +-#: tmp/oscap.glade.h:3 +-msgid "Apply security policy:" +-msgstr "Aplica la política de seguretat:" +- +-#: tmp/oscap.glade.h:4 +-msgid "Data stream:" +-msgstr "Flux de dades:" +- +-#: tmp/oscap.glade.h:5 +-msgid "Checklist:" +-msgstr "Llista de comprovació:" +- +-#: tmp/oscap.glade.h:6 +-msgid "Choose profile below:" +-msgstr "Trieu el perfil a sota:" +- +-#: tmp/oscap.glade.h:7 +-msgid "Profile" +-msgstr "Perfil" +- +-#: tmp/oscap.glade.h:8 +-msgid "Selected" +-msgstr "Seleccionat" +- +-#: tmp/oscap.glade.h:9 +-msgid "_Select profile" +-msgstr "_Selecciona el perfil" +- +-#: tmp/oscap.glade.h:10 +-msgid "Changes that were done or need to be done:" +-msgstr "Els canvis que es van fer o s'han de fer:" +- +-#: tmp/oscap.glade.h:11 +-msgid "_Use SCAP Security Guide" +-msgstr "_Utilitza la guia de seguretat SCAP" +- +-#: tmp/oscap.glade.h:12 +-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 1970-01-01 01:00:00.000000000 +0100 +@@ -1,275 +0,0 @@ +-# SOME DESCRIPTIVE TITLE. +-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +-# This file is distributed under the same license as the PACKAGE package. +-# +-# Translators: +-# vpodzime , 2014-2015 +-# Zdenek , 2016. #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" +-"Language-Team: Czech (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/cs/)\n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" +-"Language: cs\n" +-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +-"X-Generator: Zanata 4.4.5\n" +- +-#: ../org_fedora_oscap/rule_handling.py:392 +-#, python-brace-format +-msgid "" +-"{0} must be on a separate partition or logical volume and has to be created " +-"in the partitioning layout before installation can occur with a security " +-"profile" +-msgstr "" +- +-#. template for the message +-#: ../org_fedora_oscap/rule_handling.py:403 +-#, 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 +-#, 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 +-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 +-#, 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 +-#, 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 +-#, 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 +-msgid "Kdump will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:758 +-msgid "Kdump will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:905 +-msgid "Firewall will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:912 +-msgid "Firewall will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:920 +-#: ../org_fedora_oscap/rule_handling.py:957 +-#, 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 +-#, 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 +-#, 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 +-#, 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 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +- +-#: ../org_fedora_oscap/ks/oscap.py: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:196 +-msgid "_SECURITY POLICY" +-msgstr "_POLITIKA ZABEZPEČENÍ" +- +-#. the first status provided +-#: ../org_fedora_oscap/gui/spokes/oscap.py:221 +-msgid "Not ready" +-msgstr "Není připraven" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:369 +-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 +-msgid "No profile selected" +-msgstr "Není vybrán žádný profil" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-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 +-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 +-msgid "Invalid or unsupported content URL, please enter a different one." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:800 +-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 +-msgid "" +-"Network error encountered when fetching data. Please check that network is " +-"setup and working." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:817 +-msgid "The integrity check of the content failed. Cannot use the content." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:825 +-#, 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 +-#, 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 +-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 +-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 +-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 +-msgid "Error fetching and loading content" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 +-msgid "No content found" +-msgstr "Žádná data k dispozici" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 +-msgid "Misconfiguration detected" +-msgstr "Detekována nesprávná konfigurace" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-msgid "Warnings appeared" +-msgstr "Varování" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 +-msgid "Everything okay" +-msgstr "Vše v pořádku" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 +-msgid "Invalid or unsupported URL" +-msgstr "Nevalidní nebo nepodporované URL" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:13 +-msgid "Fetching content..." +-msgstr "Načítám data..." +- +-#: tmp/oscap.glade.h:1 +-msgid "SECURITY POLICY" +-msgstr "POLITIKA ZABEZPEČENÍ" +- +-#: tmp/oscap.glade.h:2 +-msgid "_Change content" +-msgstr "_Jiná data" +- +-#: tmp/oscap.glade.h:3 +-msgid "Apply security policy:" +-msgstr "Aplikovat bezpečnostní politiku:" +- +-#: tmp/oscap.glade.h:4 +-msgid "Data stream:" +-msgstr "Data stream:" +- +-#: tmp/oscap.glade.h:5 +-msgid "Checklist:" +-msgstr "Checklist:" +- +-#: tmp/oscap.glade.h:6 +-msgid "Choose profile below:" +-msgstr "Vyberte profil:" +- +-#: tmp/oscap.glade.h:7 +-msgid "Profile" +-msgstr "Profil" +- +-#: tmp/oscap.glade.h:8 +-msgid "Selected" +-msgstr "Vybrán" +- +-#: tmp/oscap.glade.h:9 +-msgid "_Select profile" +-msgstr "_Vybrat profil" +- +-#: tmp/oscap.glade.h:10 +-msgid "Changes that were done or need to be done:" +-msgstr "Změny, které byly nebo musejí být provedeny:" +- +-#: tmp/oscap.glade.h:11 +-msgid "_Use SCAP Security Guide" +-msgstr "_Použít SCAP Security Guide" +- +-#: tmp/oscap.glade.h:12 +-msgid "_Fetch" +-msgstr "_Načíst" +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-02-13 12:55:08.614070613 +0100 +@@ -0,0 +1,306 @@ ++# 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: 2019-02-12 02:14+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:392 ++#, 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:403 ++#, 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:502 ++#, 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:509 ++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:515 ++#, 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:619 ++#: ../org_fedora_oscap/rule_handling.py:634 ++#, 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:643 ++#: ../org_fedora_oscap/rule_handling.py:658 ++#, 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:756 ++msgid "Kdump will be disabled on startup" ++msgstr "Kdump wird beim Start deaktiviert" ++ ++#: ../org_fedora_oscap/rule_handling.py:758 ++msgid "Kdump will be enabled on startup" ++msgstr "Kdump wird beim Start aktiviert" ++ ++#: ../org_fedora_oscap/rule_handling.py:905 ++msgid "Firewall will be disabled on startup" ++msgstr "Die Firewall wird beim Start deaktiviert" ++ ++#: ../org_fedora_oscap/rule_handling.py:912 ++msgid "Firewall will be enabled on startup" ++msgstr "Die Firewall wird beim Start aktiviert" ++ ++#: ../org_fedora_oscap/rule_handling.py:920 ++#: ../org_fedora_oscap/rule_handling.py:957 ++#, 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:927 ++#: ../org_fedora_oscap/rule_handling.py:968 ++#, 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:934 ++#: ../org_fedora_oscap/rule_handling.py:979 ++#, 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:988 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#, 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:196 ++msgid "_SECURITY POLICY" ++msgstr "_SICHERHEITSPOLITIK" ++ ++#. the first status provided ++#: ../org_fedora_oscap/gui/spokes/oscap.py:221 ++msgid "Not ready" ++msgstr "Nicht bereit" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:369 ++msgid "Fetching content data" ++msgstr "Inhaltsdaten abrufen" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:636 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1042 ++msgid "No profile selected" ++msgstr "Kein Profil ausgewählt" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:641 ++msgid "No rules for the pre-installation phase" ++msgstr "Keine Regeln für die Vorinstallationsphase" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:784 ++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:792 ++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:800 ++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:808 ++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:817 ++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:825 ++#, 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:843 ++#, 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:859 ++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:890 ++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:894 ++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:1032 ++msgid "Error fetching and loading content" ++msgstr "Fehler beim Abrufen und Laden von Inhalten" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 ++msgid "No content found" ++msgstr "Kein Inhalt gefunden" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 ++msgid "Misconfiguration detected" ++msgstr "Fehlkonfiguration erkannt" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++msgid "Warnings appeared" ++msgstr "Warnungen erschienen" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 ++msgid "Everything okay" ++msgstr "Alles okay" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 ++msgid "Invalid or unsupported URL" ++msgstr "Ungültige oder nicht unterstützte URL" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 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 ++msgid "Profile" ++msgstr "Profil" ++ ++#: tmp/oscap.glade.h:8 ++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-02-13 12:55:08.614070613 +0100 +@@ -5,20 +5,22 @@ + # Translators: + # Gerardo Rosales , 2014 + # Máximo Castañeda Riloba , 2016. #zanata ++# 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" ++"PO-Revision-Date: 2019-02-12 02:16+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" + + #: ../org_fedora_oscap/rule_handling.py:392 + #, python-brace-format +@@ -27,6 +29,9 @@ + "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" + + #. template for the message + #: ../org_fedora_oscap/rule_handling.py:403 +@@ -57,6 +62,8 @@ + "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" + + #: ../org_fedora_oscap/rule_handling.py:619 + #: ../org_fedora_oscap/rule_handling.py:634 +@@ -72,19 +79,19 @@ + + #: ../org_fedora_oscap/rule_handling.py:756 + msgid "Kdump will be disabled on startup" +-msgstr "" ++msgstr "Se desactivará Kdump al inicio" + + #: ../org_fedora_oscap/rule_handling.py:758 + msgid "Kdump will be enabled on startup" +-msgstr "" ++msgstr "Se activará Kdump al inicio" + + #: ../org_fedora_oscap/rule_handling.py:905 + msgid "Firewall will be disabled on startup" +-msgstr "" ++msgstr "Se desactivará el cortafuegos al inicio" + + #: ../org_fedora_oscap/rule_handling.py:912 + msgid "Firewall will be enabled on startup" +-msgstr "" ++msgstr "Se activará el cortafuegos al inicio" + + #: ../org_fedora_oscap/rule_handling.py:920 + #: ../org_fedora_oscap/rule_handling.py:957 +@@ -93,6 +100,8 @@ + "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" + + #: ../org_fedora_oscap/rule_handling.py:927 + #: ../org_fedora_oscap/rule_handling.py:968 +@@ -100,6 +109,7 @@ + msgid "" + "port '%s' has been added to the list of ports to be added to the firewall" + msgstr "" ++"el puerto '%s' se ha añadido a la lista de puertos a añadir al cortafuegos" + + #: ../org_fedora_oscap/rule_handling.py:934 + #: ../org_fedora_oscap/rule_handling.py:979 +@@ -107,6 +117,8 @@ + 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" + + #: ../org_fedora_oscap/rule_handling.py:988 + #: ../org_fedora_oscap/rule_handling.py:1003 +@@ -115,6 +127,8 @@ + "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,17 +137,22 @@ + "%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?" + + #. title of the spoke (will be displayed on the hub) + #: ../org_fedora_oscap/gui/spokes/oscap.py:196 + msgid "_SECURITY POLICY" +-msgstr "POLÍTICA DE _SEGURIDAD" ++msgstr "_POLÍTICA DE SEGURIDAD" + + #. the first status provided + #: ../org_fedora_oscap/gui/spokes/oscap.py:221 +@@ -161,6 +180,8 @@ + #: ../org_fedora_oscap/gui/spokes/oscap.py:792 + msgid "Invalid or unsupported content URL, please enter a different one." + msgstr "" ++"La URL del contenido no es válida o no está admitida, por favor introduzca " ++"una nueva." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:800 + msgid "Failed to fetch content. Enter a different URL, please." +@@ -172,10 +193,14 @@ + "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." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:817 + msgid "The integrity check of the content failed. Cannot use the content." + msgstr "" ++"Falló la comprobación de la integridad del contenido. No se puede usar el " ++"mismo." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:825 + #, python-format +@@ -189,6 +214,7 @@ + "Profile with ID '%s' not defined in the content. Select a different profile," + " please" + msgstr "" ++"El perfil con ID '%s' no está definido en el contenido. Elija uno diferente." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:859 + msgid "Not applying security policy" +@@ -210,7 +236,7 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:1032 + msgid "Error fetching and loading content" +-msgstr "" ++msgstr "Error al obtener y cargar el contenido" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:1039 + msgid "No content found" +@@ -270,7 +296,7 @@ + + #: 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:" +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-02-13 12:55:08.614070613 +0100 +@@ -6,20 +6,22 @@ + # dominique bribanick , 2014 + # Jérôme Fenal , 2014 + # Jean-Baptiste Holcroft , 2016. #zanata ++# 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-07-15 04:50+0000\n" +-"Last-Translator: Jean-Baptiste Holcroft \n" ++"PO-Revision-Date: 2019-02-12 02:08+0000\n" ++"Last-Translator: Ludek Janda \n" + "Language-Team: French (http://www.transifex.com/projects/p/oscap-anaconda-addon/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" + "Plural-Forms: nplurals=2; plural=(n > 1);\n" +-"X-Generator: Zanata 4.4.5\n" ++"X-Generator: Zanata 4.6.2\n" + + #: ../org_fedora_oscap/rule_handling.py:392 + #, python-brace-format +@@ -28,6 +30,9 @@ + "in the partitioning layout before installation can occur with a security " + "profile" + 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é." + + #. template for the message + #: ../org_fedora_oscap/rule_handling.py:403 +@@ -59,6 +64,8 @@ + "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" + + #: ../org_fedora_oscap/rule_handling.py:619 + #: ../org_fedora_oscap/rule_handling.py:634 +@@ -74,19 +81,19 @@ + + #: ../org_fedora_oscap/rule_handling.py:756 + msgid "Kdump will be disabled on startup" +-msgstr "" ++msgstr "Kdump va être désactivé au démarrage" + + #: ../org_fedora_oscap/rule_handling.py:758 + msgid "Kdump will be enabled on startup" +-msgstr "" ++msgstr "Kdump va être activé au démarrage" + + #: ../org_fedora_oscap/rule_handling.py:905 + msgid "Firewall will be disabled on startup" +-msgstr "" ++msgstr "Le pare-feu va être désactivé au démarrage" + + #: ../org_fedora_oscap/rule_handling.py:912 + msgid "Firewall will be enabled on startup" +-msgstr "" ++msgstr "Le pare-feu va être activé au démarrage" + + #: ../org_fedora_oscap/rule_handling.py:920 + #: ../org_fedora_oscap/rule_handling.py:957 +@@ -95,13 +102,14 @@ + "service '%s' has been added to the list of services to be added to the " + "firewall" + msgstr "" ++"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 + #, 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" + + #: ../org_fedora_oscap/rule_handling.py:934 + #: ../org_fedora_oscap/rule_handling.py:979 +@@ -109,6 +117,7 @@ + msgid "" + "trust '%s' has been added to the list of trusts to be added to the firewall" + msgstr "" ++"trust « %s » a été ajouté à la liste des paquets à ajouter au pare-feu" + + #: ../org_fedora_oscap/rule_handling.py:988 + #: ../org_fedora_oscap/rule_handling.py:1003 +@@ -117,6 +126,7 @@ + "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,17 +135,22 @@ + "%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 ?" + + #. title of the spoke (will be displayed on the hub) + #: ../org_fedora_oscap/gui/spokes/oscap.py:196 + msgid "_SECURITY POLICY" +-msgstr "POLITIQUE DE _SÉCURITÉ :" ++msgstr "_POLITIQUE DE SÉCURITÉ" + + #. the first status provided + #: ../org_fedora_oscap/gui/spokes/oscap.py:221 +@@ -162,6 +177,8 @@ + #: ../org_fedora_oscap/gui/spokes/oscap.py:792 + msgid "Invalid or unsupported content URL, please enter a different one." + msgstr "" ++"URL de contenu non prise en charge ou non valide, veuillez saisir une URL " ++"différente." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:800 + msgid "Failed to fetch content. Enter a different URL, please." +@@ -173,10 +190,14 @@ + "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." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:817 + msgid "The integrity check of the content failed. Cannot use the content." + msgstr "" ++"Le contrôle d'intégrité du contenu a échoué. Impossible d'utiliser le " ++"contenu." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:825 + #, python-format +@@ -190,6 +211,8 @@ + "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." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:859 + msgid "Not applying security policy" +@@ -211,7 +234,7 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:1032 + msgid "Error fetching and loading content" +-msgstr "" ++msgstr "Erreur d'extraction et de chargement du contenu" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:1039 + msgid "No content found" +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 1970-01-01 01:00:00.000000000 +0100 +@@ -1,278 +0,0 @@ +-# SOME DESCRIPTIVE TITLE. +-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +-# This file is distributed under the same license as the PACKAGE package. +-# +-# Translators: +-# Zoltan Hoppár , 2014 +-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-04-02 03:06+0000\n" +-"Last-Translator: Copied by Zanata \n" +-"Language-Team: Hungarian (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/hu/)\n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" +-"Language: hu\n" +-"Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Zanata 4.4.5\n" +- +-#: ../org_fedora_oscap/rule_handling.py:392 +-#, python-brace-format +-msgid "" +-"{0} must be on a separate partition or logical volume and has to be created " +-"in the partitioning layout before installation can occur with a security " +-"profile" +-msgstr "" +- +-#. template for the message +-#: ../org_fedora_oscap/rule_handling.py:403 +-#, python-format +-msgid "" +-"mount option '%(mount_option)s' added for the mount point %(mount_point)s" +-msgstr "" +-"a '%(mount_option)s' csatolási opció hozzáadásra került ehhez: " +-"%(mount_point)s" +- +-#. root password was not set +-#: ../org_fedora_oscap/rule_handling.py:502 +-#, 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 +-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 +-#, 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 +-#, 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 +-#, 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 +-msgid "Kdump will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:758 +-msgid "Kdump will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:905 +-msgid "Firewall will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:912 +-msgid "Firewall will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:920 +-#: ../org_fedora_oscap/rule_handling.py:957 +-#, 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 +-#, 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 +-#, 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 +-#, 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 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +- +-#: ../org_fedora_oscap/ks/oscap.py: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:196 +-msgid "_SECURITY POLICY" +-msgstr "" +- +-#. the first status provided +-#: ../org_fedora_oscap/gui/spokes/oscap.py:221 +-msgid "Not ready" +-msgstr "Nincs még kész" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:369 +-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 +-msgid "No profile selected" +-msgstr "Nincs profil kiválasztva" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-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 +-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 +-msgid "Invalid or unsupported content URL, please enter a different one." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:800 +-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 +-msgid "" +-"Network error encountered when fetching data. Please check that network is " +-"setup and working." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:817 +-msgid "The integrity check of the content failed. Cannot use the content." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:825 +-#, 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 +-#, 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 +-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 +-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 +-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 +-msgid "Error fetching and loading content" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 +-msgid "No content found" +-msgstr "Tartalom nem található" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 +-msgid "Misconfiguration detected" +-msgstr "Helytelen beállítások észlelve" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-msgid "Warnings appeared" +-msgstr "Figyelmeztetések jelentek meg" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 +-msgid "Everything okay" +-msgstr "Minden rendben" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 +-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 +-msgid "Fetching content..." +-msgstr "Tartalom letöltése..." +- +-#: tmp/oscap.glade.h:1 +-msgid "SECURITY POLICY" +-msgstr "" +- +-#: tmp/oscap.glade.h:2 +-msgid "_Change content" +-msgstr "Tartalom megváltoztatása" +- +-#: tmp/oscap.glade.h:3 +-msgid "Apply security policy:" +-msgstr "Biztonsági szabályzat alkalmazása:" +- +-#: tmp/oscap.glade.h:4 +-msgid "Data stream:" +-msgstr "Adathalmaz:" +- +-#: tmp/oscap.glade.h:5 +-msgid "Checklist:" +-msgstr "Ellenőrző lista:" +- +-#: tmp/oscap.glade.h:6 +-msgid "Choose profile below:" +-msgstr "Válasszon egy profilt alább:" +- +-#: tmp/oscap.glade.h:7 +-msgid "Profile" +-msgstr "Profil" +- +-#: tmp/oscap.glade.h:8 +-msgid "Selected" +-msgstr "Kiválasztva" +- +-#: tmp/oscap.glade.h:9 +-msgid "_Select profile" +-msgstr "Vála_sszon egy profilt" +- +-#: tmp/oscap.glade.h:10 +-msgid "Changes that were done or need to be done:" +-msgstr "Változtatások amiket meg kell tenni vagy elkészültek:" +- +-#: tmp/oscap.glade.h:11 +-msgid "_Use SCAP Security Guide" +-msgstr "SCAP Biztonsági könyv előírásainak használata" +- +-#: tmp/oscap.glade.h:12 +-msgid "_Fetch" +-msgstr "Letöltés" +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-02-13 12:55:08.614070613 +0100 +@@ -0,0 +1,303 @@ ++# 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: 2019-02-12 02:17+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:392 ++#, 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:403 ++#, 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:502 ++#, 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:509 ++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:515 ++#, 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:619 ++#: ../org_fedora_oscap/rule_handling.py:634 ++#, 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:643 ++#: ../org_fedora_oscap/rule_handling.py:658 ++#, 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:756 ++msgid "Kdump will be disabled on startup" ++msgstr "Kdump sarà disabilitato all'avvio" ++ ++#: ../org_fedora_oscap/rule_handling.py:758 ++msgid "Kdump will be enabled on startup" ++msgstr "Kdump sarà abilitato all'avvio" ++ ++#: ../org_fedora_oscap/rule_handling.py:905 ++msgid "Firewall will be disabled on startup" ++msgstr "Il firewall sarà disabilitato all'avvio" ++ ++#: ../org_fedora_oscap/rule_handling.py:912 ++msgid "Firewall will be enabled on startup" ++msgstr "Il firewall sarà abilitato all'avvio" ++ ++#: ../org_fedora_oscap/rule_handling.py:920 ++#: ../org_fedora_oscap/rule_handling.py:957 ++#, 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:927 ++#: ../org_fedora_oscap/rule_handling.py:968 ++#, 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:934 ++#: ../org_fedora_oscap/rule_handling.py:979 ++#, 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:988 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#, 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:196 ++msgid "_SECURITY POLICY" ++msgstr "_POLITICA DI SICUREZZA" ++ ++#. the first status provided ++#: ../org_fedora_oscap/gui/spokes/oscap.py:221 ++msgid "Not ready" ++msgstr "Non pronto" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:369 ++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:1042 ++msgid "No profile selected" ++msgstr "Nessun profilo selezionato" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:641 ++msgid "No rules for the pre-installation phase" ++msgstr "Nessuna regola per la fase di pre-installazione" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:784 ++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:792 ++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:800 ++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:808 ++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:817 ++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:825 ++#, 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:843 ++#, 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:859 ++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:890 ++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:894 ++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:1032 ++msgid "Error fetching and loading content" ++msgstr "Errore durante il recupero e il caricamento del contenuto" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 ++msgid "No content found" ++msgstr "Nessun contenuto trovato" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 ++msgid "Misconfiguration detected" ++msgstr "Rilevata errata configurazione" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++msgid "Warnings appeared" ++msgstr "Sono apparsi avvertimenti" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 ++msgid "Everything okay" ++msgstr "Tutto ok" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 ++msgid "Invalid or unsupported URL" ++msgstr "URL non valido o non supportato" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 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-02-13 12:55:08.614070613 +0100 +@@ -1,18 +1,19 @@ + # Ooyama Yosiyuki , 2015. #zanata ++# Ludek Janda , 2018. #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" ++"PO-Revision-Date: 2018-08-23 03:20+0000\n" ++"Last-Translator: Copied by Zanata \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" + + #: ../org_fedora_oscap/rule_handling.py:392 + #, python-brace-format +@@ -21,23 +22,25 @@ + "in the partitioning layout before installation can occur with a security " + "profile" + msgstr "" ++"{0} " ++"は、別のパーティションもしくは論理ボリューム上になければなりません。また、セキュリティープロファイルがインストールされる前にパーティションレイアウトに作成されなければなりません" + + #. template for the message + #: ../org_fedora_oscap/rule_handling.py:403 + #, python-format + msgid "" + "mount option '%(mount_option)s' added for the mount point %(mount_point)s" +-msgstr "" ++msgstr "マウントオプション '%(mount_option)s' が、マウントポイント %(mount_point)s に追加されました" + + #. root password was not set + #: ../org_fedora_oscap/rule_handling.py:502 + #, python-format + msgid "make sure to create password with minimal length of %d characters" +-msgstr "" ++msgstr "%d 文字以上のパスワードを作成してください。" + + #: ../org_fedora_oscap/rule_handling.py:509 + msgid "cannot check root password length (password is crypted)" +-msgstr "" ++msgstr "root パスワードの長さを確認できません (パスワードは暗号化済み)" + + #. too short + #: ../org_fedora_oscap/rule_handling.py:515 +@@ -45,35 +48,35 @@ + msgid "" + "root password is too short, a longer one with at least %d characters is " + "required" +-msgstr "" ++msgstr "root のパスワードが短すぎます。%d 文字以上にする必要があります。" + + #: ../org_fedora_oscap/rule_handling.py:619 + #: ../org_fedora_oscap/rule_handling.py:634 + #, python-format + msgid "package '%s' has been added to the list of to be installed packages" +-msgstr "" ++msgstr "パッケージ '%s' が、インストール予定パッケージ一覧に追加されました" + + #: ../org_fedora_oscap/rule_handling.py:643 + #: ../org_fedora_oscap/rule_handling.py:658 + #, python-format + msgid "package '%s' has been added to the list of excluded packages" +-msgstr "" ++msgstr "パッケージ '%s' が、除外パッケージ一覧に追加されました" + + #: ../org_fedora_oscap/rule_handling.py:756 + msgid "Kdump will be disabled on startup" +-msgstr "" ++msgstr "Kdump は起動時に無効になります" + + #: ../org_fedora_oscap/rule_handling.py:758 + msgid "Kdump will be enabled on startup" +-msgstr "" ++msgstr "Kdump は起動時に有効になります" + + #: ../org_fedora_oscap/rule_handling.py:905 + msgid "Firewall will be disabled on startup" +-msgstr "" ++msgstr "ファイアウォールは起動時に無効になります" + + #: ../org_fedora_oscap/rule_handling.py:912 + msgid "Firewall will be enabled on startup" +-msgstr "" ++msgstr "ファイアウォールは起動時に有効になります" + + #: ../org_fedora_oscap/rule_handling.py:920 + #: ../org_fedora_oscap/rule_handling.py:957 +@@ -81,21 +84,21 @@ + msgid "" + "service '%s' has been added to the list of services to be added to the " + "firewall" +-msgstr "" ++msgstr "サービス '%s' が、ファイアウォールに追加予定のサービス一覧に追加されました" + + #: ../org_fedora_oscap/rule_handling.py:927 + #: ../org_fedora_oscap/rule_handling.py:968 + #, python-format + msgid "" + "port '%s' has been added to the list of ports to be added to the firewall" +-msgstr "" ++msgstr "ポート '%s' が、ファイアウォールに追加予定のポート一覧に追加されました" + + #: ../org_fedora_oscap/rule_handling.py:934 + #: ../org_fedora_oscap/rule_handling.py:979 + #, python-format + msgid "" + "trust '%s' has been added to the list of trusts to be added to the firewall" +-msgstr "" ++msgstr "トラスト '%s' が、ファイアウォールに追加予定のトラスト一覧に追加されました" + + #: ../org_fedora_oscap/rule_handling.py:988 + #: ../org_fedora_oscap/rule_handling.py:1003 +@@ -103,7 +106,7 @@ + msgid "" + "service '%s' has been added to the list of services to be removed from the " + "firewall" +-msgstr "" ++msgstr "サービス '%s' が、ファイアウォールから削除予定のサービス一覧に追加されました" + + #: ../org_fedora_oscap/ks/oscap.py:420 + #, python-format +@@ -112,26 +115,31 @@ + "%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:196 + msgid "_SECURITY POLICY" +-msgstr "" ++msgstr "セキュリティーポリシー(_S)" + + #. the first status provided + #: ../org_fedora_oscap/gui/spokes/oscap.py:221 + msgid "Not ready" +-msgstr "" ++msgstr "準備ができていません" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:369 + msgid "Fetching content data" +-msgstr "" ++msgstr "コンテンツデータの取得中" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:636 + #: ../org_fedora_oscap/gui/spokes/oscap.py:1042 +@@ -140,64 +148,64 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:641 + msgid "No rules for the pre-installation phase" +-msgstr "" ++msgstr "プレインストールフェーズのルールがありません" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:784 + msgid "Invalid content provided. Enter a different URL, please." +-msgstr "" ++msgstr "無効なコンテンツが入力されました。別の URL を入力してください。" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:792 + msgid "Invalid or unsupported content URL, please enter a different one." +-msgstr "" ++msgstr "コンテンツ URL が無効またはサポートされていません。別の URL を入力していません。" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:800 + msgid "Failed to fetch content. Enter a different URL, please." +-msgstr "" ++msgstr "コンテンツの取得に失敗しました。別の URL を入力してください。" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:808 + msgid "" + "Network error encountered when fetching data. Please check that network is " + "setup and working." +-msgstr "" ++msgstr "データの取得時にネットワークエラーが発生しました。ネットワークが設定されており、動作していることを確認してください。" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:817 + msgid "The integrity check of the content failed. Cannot use the content." +-msgstr "" ++msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:825 + #, python-format + msgid "Failed to extract content (%s). Enter a different URL, please." +-msgstr "" ++msgstr "コンテンツ (%s) の抽出に失敗しました。別の URL を入力してください。" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:843 + #, python-format + msgid "" + "Profile with ID '%s' not defined in the content. Select a different profile," + " please" +-msgstr "" ++msgstr "コンテンツで ID が '%s' のプロファイルが定義されていません。別のプロファイルを選択してください。" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:859 + msgid "Not applying security policy" +-msgstr "" ++msgstr "セキュリティーポリシーを適用しない" + + #. TRANSLATORS: the other choice if SCAP Security Guide is also + #. available + #: ../org_fedora_oscap/gui/spokes/oscap.py:890 + msgid " or enter data stream content or archive URL below:" +-msgstr "" ++msgstr "またはデータストリームコンテンツを入力するか、以下の URL をアーカイブ化する:" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:894 + msgid "" + "No content found. Please enter data stream content or archive URL below:" +-msgstr "" ++msgstr "コンテンツが見つかりませんでした。データストリームコンテンツを入力するか、以下の URL をアーカイブ化してください:" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:1032 + msgid "Error fetching and loading content" +-msgstr "" ++msgstr "コンテンツの取得およびロードのエラー" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:1039 + msgid "No content found" +-msgstr "" ++msgstr "コンテンツが見つかりませんでした" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:1050 + msgid "Misconfiguration detected" +@@ -205,7 +213,7 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:1056 + msgid "Warnings appeared" +-msgstr "" ++msgstr "警告が表示されました" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:1058 + msgid "Everything okay" +@@ -217,52 +225,52 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:13 + msgid "Fetching content..." +-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 "チェックリスト:" + + #: tmp/oscap.glade.h:6 + msgid "Choose profile below:" +-msgstr "" ++msgstr "以下のプロファイルを選択:" + + #: tmp/oscap.glade.h:7 + msgid "Profile" +-msgstr "" ++msgstr "プロファイル" + + #: tmp/oscap.glade.h:8 + msgid "Selected" +-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 + msgid "_Use SCAP Security Guide" +-msgstr "" ++msgstr "SCAP セキュリティーガイドを使用する(_U)" + + #: tmp/oscap.glade.h:12 + msgid "_Fetch" +-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-02-13 12:55:08.614070613 +0100 +@@ -0,0 +1,275 @@ ++# Ludek Janda , 2018. #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: 2018-09-20 03:07+0000\n" ++"Last-Translator: Copied by Zanata \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:392 ++#, 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:403 ++#, 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:502 ++#, python-format ++msgid "make sure to create password with minimal length of %d characters" ++msgstr "최소 %d자 이상으로 암호를 만들어야 합니다 " ++ ++#: ../org_fedora_oscap/rule_handling.py:509 ++msgid "cannot check root password length (password is crypted)" ++msgstr "root 암호 길이를 확인할 수 없습니다 (암호가 암호화됨)" ++ ++#. too short ++#: ../org_fedora_oscap/rule_handling.py:515 ++#, 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:619 ++#: ../org_fedora_oscap/rule_handling.py:634 ++#, 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 ++#, python-format ++msgid "package '%s' has been added to the list of excluded packages" ++msgstr "패키지 '%s'이/가 제외된 패키지 목록에 추가되었습니다. " ++ ++#: ../org_fedora_oscap/rule_handling.py:756 ++msgid "Kdump will be disabled on startup" ++msgstr "시작시 Kdump가 비활성화됩니다. " ++ ++#: ../org_fedora_oscap/rule_handling.py:758 ++msgid "Kdump will be enabled on startup" ++msgstr "시작시 Kdump가 활성화됩니다. " ++ ++#: ../org_fedora_oscap/rule_handling.py:905 ++msgid "Firewall will be disabled on startup" ++msgstr "시작시 방화벽이 비활성화됩니다. " ++ ++#: ../org_fedora_oscap/rule_handling.py:912 ++msgid "Firewall will be enabled on startup" ++msgstr "시작시 방화벽이 활성화됩니다. " ++ ++#: ../org_fedora_oscap/rule_handling.py:920 ++#: ../org_fedora_oscap/rule_handling.py:957 ++#, 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:927 ++#: ../org_fedora_oscap/rule_handling.py:968 ++#, 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 ++#, 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:988 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#, 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:196 ++msgid "_SECURITY POLICY" ++msgstr "보안 정책(_S):" ++ ++#. the first status provided ++#: ../org_fedora_oscap/gui/spokes/oscap.py:221 ++msgid "Not ready" ++msgstr "준비되어 있지 않습니다 " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:369 ++msgid "Fetching content data" ++msgstr "컨텐츠 데이터를 가져오는 중 " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:636 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1042 ++msgid "No profile selected" ++msgstr "프로파일이 선택되지 않았습니다 " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:641 ++msgid "No rules for the pre-installation phase" ++msgstr "사전 설치 단계의 규칙이 없습니다 " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:784 ++msgid "Invalid content provided. Enter a different URL, please." ++msgstr "잘못된 내용이 입력되었습니다. 다른 URL을 입력하십시오. " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:792 ++msgid "Invalid or unsupported content URL, please enter a different one." ++msgstr "유효하지 않거나 지원되지 않는 컨텐츠 URL입니다. 다른 URL을 입력하십시오. " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:800 ++msgid "Failed to fetch content. Enter a different URL, please." ++msgstr "컨텐츠를 가져오지 못했습니다. 다른 URL을 입력하십시오. " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:808 ++msgid "" ++"Network error encountered when fetching data. Please check that network is " ++"setup and working." ++msgstr "컨텐츠를 가져오는 중 네트워크 오류가 발생했습니다. 네트워크가 제대로 작동하는지 확인하십시오. " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:817 ++msgid "The integrity check of the content failed. Cannot use the content." ++msgstr "컨텐츠 무결성 검사에 실패했습니다. 컨텐츠를 사용할 수 없습니다. " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:825 ++#, python-format ++msgid "Failed to extract content (%s). Enter a different URL, please." ++msgstr "컨텐츠 (%s)을/를 가져오지 못했습니다. 다른 URL을 입력하십시오. " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:843 ++#, 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:859 ++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 ++msgid " or enter data stream content or archive URL below:" ++msgstr "데이터 스트림 컨텐츠를 입력하거나 다음 URL을 아카이브하십시오." ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:894 ++msgid "" ++"No content found. Please enter data stream content or archive URL below:" ++msgstr "내용이 없습니다. 데이터 스트림 컨텐츠를 입력하거나 또는 다음 URL을 아카이브하십시오." ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1032 ++msgid "Error fetching and loading content" ++msgstr "컨텐츠 오류 가져오기 및 로딩 오류 " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 ++msgid "No content found" ++msgstr "컨텐츠를 찾을 수 없음 " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 ++msgid "Misconfiguration detected" ++msgstr "설정 오류가 감지되었습니다 " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++msgid "Warnings appeared" ++msgstr "경고가 표시되었습니다 " ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 ++msgid "Everything okay" ++msgstr "모든 것이 정상입니다" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 ++msgid "Invalid or unsupported URL" ++msgstr "유효하지 않거나 지원되지 않는 URL" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 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)" +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-02-13 12:55:08.616070647 +0100 +@@ -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 +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 1970-01-01 01:00:00.000000000 +0100 +@@ -1,293 +0,0 @@ +-# SOME DESCRIPTIVE TITLE. +-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +-# This file is distributed under the same license as the PACKAGE package. +-# +-# Translators: +-# Bartosz Sapijaszko , 2002 +-# dcantrel , 2011 +-# Dimitris Glezos , 2011 +-# Dimitris Glezos , 2011 +-# Jacek Smyda , 1998 +-# Leszek Matok , 2004 +-# Pawel Szopinski , 2004 +-# Piotr Drąg , 2014 +-# Radosław Zawartko , 2004 +-# sonyam , 2004 +-# Stanisław Małolepszy , 2006 +-# Tom Berner , 2005 +-# Tom Berner , 2004 +-# Wojciech Kapusta , 2006 +-# Piotr Drąg , 2015. #zanata +-# Piotr Drąg , 2016. #zanata +-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" +-"Last-Translator: Piotr Drąg \n" +-"Language-Team: Polish (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/pl/)\n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" +-"Language: pl\n" +-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +-"X-Generator: Zanata 4.4.5\n" +- +-#: ../org_fedora_oscap/rule_handling.py:392 +-#, python-brace-format +-msgid "" +-"{0} must be on a separate partition or logical volume and has to be created " +-"in the partitioning layout before installation can occur with a security " +-"profile" +-msgstr "" +- +-#. template for the message +-#: ../org_fedora_oscap/rule_handling.py:403 +-#, 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 " +-"%(mount_point)s" +- +-#. root password was not set +-#: ../org_fedora_oscap/rule_handling.py:502 +-#, 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 +-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 +-#, 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 +-#, python-format +-msgid "package '%s' has been added to the list of to be installed packages" +-msgstr "dodano pakiet „%s” do listy pakietów do zainstalowania" +- +-#: ../org_fedora_oscap/rule_handling.py:643 +-#: ../org_fedora_oscap/rule_handling.py:658 +-#, python-format +-msgid "package '%s' has been added to the list of excluded packages" +-msgstr "dodano pakiet „%s” do listy wykluczonych pakietów" +- +-#: ../org_fedora_oscap/rule_handling.py:756 +-msgid "Kdump will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:758 +-msgid "Kdump will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:905 +-msgid "Firewall will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:912 +-msgid "Firewall will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:920 +-#: ../org_fedora_oscap/rule_handling.py:957 +-#, 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 +-#, 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 +-#, 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 +-#, 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 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +- +-#: ../org_fedora_oscap/ks/oscap.py: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:196 +-msgid "_SECURITY POLICY" +-msgstr "_POLITYKA BEZPIECZEŃSTWA" +- +-#. the first status provided +-#: ../org_fedora_oscap/gui/spokes/oscap.py:221 +-msgid "Not ready" +-msgstr "Niegotowe" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:369 +-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 +-msgid "No profile selected" +-msgstr "Nie wybrano profilu" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-msgid "No rules for the pre-installation phase" +-msgstr "Brak reguł dla fazy przedinstalacyjnej" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:784 +-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 +-msgid "Invalid or unsupported content URL, please enter a different one." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:800 +-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 +-msgid "" +-"Network error encountered when fetching data. Please check that network is " +-"setup and working." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:817 +-msgid "The integrity check of the content failed. Cannot use the content." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:825 +-#, 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 +-#, 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 +-msgid "Not applying security policy" +-msgstr "Bez zastosowywania polityki bezpieczeństwa" +- +-#. TRANSLATORS: the other choice if SCAP Security Guide is also +-#. available +-#: ../org_fedora_oscap/gui/spokes/oscap.py:890 +-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 +-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 +-msgid "Error fetching and loading content" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 +-msgid "No content found" +-msgstr "Nie odnaleziono treści" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 +-msgid "Misconfiguration detected" +-msgstr "Wykryto błędną konfigurację" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-msgid "Warnings appeared" +-msgstr "Pojawiły się ostrzeżenia" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 +-msgid "Everything okay" +-msgstr "Wszystko jest w porządku" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 +-msgid "Invalid or unsupported URL" +-msgstr "Nieprawidłowy lub nieobsługiwany adres URL" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:13 +-msgid "Fetching content..." +-msgstr "Pobieranie treści…" +- +-#: tmp/oscap.glade.h:1 +-msgid "SECURITY POLICY" +-msgstr "POLITYKA BEZPIECZEŃSTWA" +- +-#: tmp/oscap.glade.h:2 +-msgid "_Change content" +-msgstr "_Zmień treść" +- +-#: tmp/oscap.glade.h:3 +-msgid "Apply security policy:" +-msgstr "Zastosowanie polityki bezpieczeństwa:" +- +-#: tmp/oscap.glade.h:4 +-msgid "Data stream:" +-msgstr "Strumień danych:" +- +-#: tmp/oscap.glade.h:5 +-msgid "Checklist:" +-msgstr "Lista do sprawdzenia:" +- +-#: tmp/oscap.glade.h:6 +-msgid "Choose profile below:" +-msgstr "Proszę wybrać profil poniżej:" +- +-#: tmp/oscap.glade.h:7 +-msgid "Profile" +-msgstr "Profil" +- +-#: tmp/oscap.glade.h:8 +-msgid "Selected" +-msgstr "Wybrane" +- +-#: tmp/oscap.glade.h:9 +-msgid "_Select profile" +-msgstr "_Wybierz profil" +- +-#: tmp/oscap.glade.h:10 +-msgid "Changes that were done or need to be done:" +-msgstr "Wprowadzone zmiany i zmiany, które muszą zostać wprowadzone:" +- +-#: tmp/oscap.glade.h:11 +-msgid "_Use SCAP Security Guide" +-msgstr "_Użycie przewodnika bezpieczeństwa SCAP" +- +-#: tmp/oscap.glade.h:12 +-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-02-13 12:55:08.614070613 +0100 +@@ -5,20 +5,22 @@ + # Translators: + # Marcelo Barbosa , 2014 + # Marco Aurélio Krause , 2015. #zanata ++# 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-07 08:29+0000\n" +-"Last-Translator: Marco Aurélio Krause \n" ++"PO-Revision-Date: 2019-02-12 02:12+0000\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" + "Plural-Forms: nplurals=2; plural=(n > 1);\n" +-"X-Generator: Zanata 4.4.5\n" ++"X-Generator: Zanata 4.6.2\n" + + #: ../org_fedora_oscap/rule_handling.py:392 + #, python-brace-format +@@ -27,6 +29,9 @@ + "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" + + #. template for the message + #: ../org_fedora_oscap/rule_handling.py:403 +@@ -57,6 +62,8 @@ + "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" + + #: ../org_fedora_oscap/rule_handling.py:619 + #: ../org_fedora_oscap/rule_handling.py:634 +@@ -72,19 +79,19 @@ + + #: ../org_fedora_oscap/rule_handling.py:756 + msgid "Kdump will be disabled on startup" +-msgstr "" ++msgstr "O Kdump será desativado na inicialização" + + #: ../org_fedora_oscap/rule_handling.py:758 + msgid "Kdump will be enabled on startup" +-msgstr "" ++msgstr "O Kdump será ativado na inicialização" + + #: ../org_fedora_oscap/rule_handling.py:905 + msgid "Firewall will be disabled on startup" +-msgstr "" ++msgstr "Firewall será desativado na inicialização" + + #: ../org_fedora_oscap/rule_handling.py:912 + msgid "Firewall will be enabled on startup" +-msgstr "" ++msgstr "Firewall será ativado na inicialização" + + #: ../org_fedora_oscap/rule_handling.py:920 + #: ../org_fedora_oscap/rule_handling.py:957 +@@ -93,6 +100,8 @@ + "service '%s' has been added to the list of services to be added to the " + "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 +@@ -100,6 +109,7 @@ + msgid "" + "port '%s' has been added to the list of ports to be added to the firewall" + msgstr "" ++"port '%s'foi adicionado à lista de portas a serem adicionadas ao firewall" + + #: ../org_fedora_oscap/rule_handling.py:934 + #: ../org_fedora_oscap/rule_handling.py:979 +@@ -107,6 +117,8 @@ + 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" + + #: ../org_fedora_oscap/rule_handling.py:988 + #: ../org_fedora_oscap/rule_handling.py:1003 +@@ -115,6 +127,7 @@ + "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,12 +136,17 @@ + "%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?" + + #. title of the spoke (will be displayed on the hub) + #: ../org_fedora_oscap/gui/spokes/oscap.py:196 +@@ -160,6 +178,7 @@ + #: ../org_fedora_oscap/gui/spokes/oscap.py:792 + msgid "Invalid or unsupported content URL, please enter a different one." + msgstr "" ++"URL do conteúdo inválido ou não suportado, entre com um outro diferente." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:800 + msgid "Failed to fetch content. Enter a different URL, please." +@@ -170,10 +189,14 @@ + "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." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:817 + msgid "The integrity check of the content failed. Cannot use the content." + msgstr "" ++"A verificação de integridade do conteúdo falhou. Não é possível usar o " ++"conteúdo." + + #: ../org_fedora_oscap/gui/spokes/oscap.py:825 + #, python-format +@@ -187,6 +210,8 @@ + "Profile with ID '%s' not defined in the content. Select a different profile," + " please" + msgstr "" ++"Perfil com ID '%s' não definido no conteúdo. Selecione um perfil diferente, " ++"por favor" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:859 + msgid "Not applying security policy" +@@ -207,7 +232,7 @@ + + #: ../org_fedora_oscap/gui/spokes/oscap.py:1032 + msgid "Error fetching and loading content" +-msgstr "" ++msgstr "Erro ao buscar e carregar o conteúdo" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:1039 + msgid "No content found" +@@ -279,4 +304,4 @@ + + #: tmp/oscap.glade.h:12 + msgid "_Fetch" +-msgstr "_Buscar" ++msgstr "Buscar(_F)" +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 1970-01-01 01:00:00.000000000 +0100 +@@ -1,273 +0,0 @@ +-# Manuela Silva , 2015. #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-09-13 10:49+0000\n" +-"Last-Translator: Manuela Silva \n" +-"Language-Team: Portuguese\n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" +-"Language: pt\n" +-"Plural-Forms: nplurals=2; plural=(n != 1)\n" +-"X-Generator: Zanata 4.4.5\n" +- +-#: ../org_fedora_oscap/rule_handling.py:392 +-#, python-brace-format +-msgid "" +-"{0} must be on a separate partition or logical volume and has to be created " +-"in the partitioning layout before installation can occur with a security " +-"profile" +-msgstr "" +- +-#. template for the message +-#: ../org_fedora_oscap/rule_handling.py:403 +-#, python-format +-msgid "" +-"mount option '%(mount_option)s' added for the mount point %(mount_point)s" +-msgstr "" +-"opção de montagem '%(mount_option)s' adicionada ao ponto de montagem " +-"%(mount_point)s" +- +-#. root password was not set +-#: ../org_fedora_oscap/rule_handling.py:502 +-#, 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 +-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 +-#, 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 +-#, 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 +-#, python-format +-msgid "package '%s' has been added to the list of excluded packages" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:756 +-msgid "Kdump will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:758 +-msgid "Kdump will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:905 +-msgid "Firewall will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:912 +-msgid "Firewall will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:920 +-#: ../org_fedora_oscap/rule_handling.py:957 +-#, 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 +-#, 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 +-#, 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 +-#, 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 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +- +-#: ../org_fedora_oscap/ks/oscap.py: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:196 +-msgid "_SECURITY POLICY" +-msgstr "POLÍTICA DE _SEGURANÇA" +- +-#. the first status provided +-#: ../org_fedora_oscap/gui/spokes/oscap.py:221 +-msgid "Not ready" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:369 +-msgid "Fetching content data" +-msgstr "Obter dados de conteúdo" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:636 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1042 +-msgid "No profile selected" +-msgstr "Nenhum perfil selecionado" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-msgid "No rules for the pre-installation phase" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:784 +-msgid "Invalid content provided. Enter a different URL, please." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:792 +-msgid "Invalid or unsupported content URL, please enter a different one." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:800 +-msgid "Failed to fetch content. Enter a different URL, please." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:808 +-msgid "" +-"Network error encountered when fetching data. Please check that network is " +-"setup and working." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:817 +-msgid "The integrity check of the content failed. Cannot use the content." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:825 +-#, python-format +-msgid "Failed to extract content (%s). Enter a different URL, please." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:843 +-#, 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 +-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 +-msgid " or enter data stream content or archive URL below:" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:894 +-msgid "" +-"No content found. Please enter data stream content or archive URL below:" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1032 +-msgid "Error fetching and loading content" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 +-msgid "No content found" +-msgstr "Nenhum conteúdo encontrado" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 +-msgid "Misconfiguration detected" +-msgstr "Detetada má configuração" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-msgid "Warnings appeared" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 +-msgid "Everything okay" +-msgstr "Está tudo bem" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 +-msgid "Invalid or unsupported URL" +-msgstr "URL inválido ou não suportado" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 tmp/oscap.glade.h:13 +-msgid "Fetching content..." +-msgstr "O obter o conteúdo..." +- +-#: tmp/oscap.glade.h:1 +-msgid "SECURITY POLICY" +-msgstr "POLÍTICA DE SEGURANÇA" +- +-#: tmp/oscap.glade.h:2 +-msgid "_Change content" +-msgstr "_Alterar conteúdo" +- +-#: tmp/oscap.glade.h:3 +-msgid "Apply security policy:" +-msgstr "Aplicar política de segurança:" +- +-#: 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 "Escolha o perfil abaixo:" +- +-#: tmp/oscap.glade.h:7 +-msgid "Profile" +-msgstr "Perfil" +- +-#: tmp/oscap.glade.h:8 +-msgid "Selected" +-msgstr "Selecionado" +- +-#: tmp/oscap.glade.h:9 +-msgid "_Select profile" +-msgstr "_Selecionar perfil" +- +-#: tmp/oscap.glade.h:10 +-msgid "Changes that were done or need to be done:" +-msgstr "Alterações que foram concluídas ou precisam de ser concluídas" +- +-#: tmp/oscap.glade.h:11 +-msgid "_Use SCAP Security Guide" +-msgstr "_Utilize o Guia de Segurança SCAP" +- +-#: tmp/oscap.glade.h:12 +-msgid "_Fetch" +-msgstr "_Obter" +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-02-13 12:55:08.614070613 +0100 +@@ -0,0 +1,295 @@ ++# 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: 2019-02-12 02:17+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:392 ++#, 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:403 ++#, 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:502 ++#, python-format ++msgid "make sure to create password with minimal length of %d characters" ++msgstr "не забудьте создать пароль с минимальной длиной %d персонажи" ++ ++#: ../org_fedora_oscap/rule_handling.py:509 ++msgid "cannot check root password length (password is crypted)" ++msgstr "не удается проверить длину пароля root (пароль зашифрован)" ++ ++#. too short ++#: ../org_fedora_oscap/rule_handling.py:515 ++#, 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:619 ++#: ../org_fedora_oscap/rule_handling.py:634 ++#, 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 ++#, python-format ++msgid "package '%s' has been added to the list of excluded packages" ++msgstr "пакет '%s'добавлен в список исключенных пакетов" ++ ++#: ../org_fedora_oscap/rule_handling.py:756 ++msgid "Kdump will be disabled on startup" ++msgstr "Kdump будет отключен при запуске" ++ ++#: ../org_fedora_oscap/rule_handling.py:758 ++msgid "Kdump will be enabled on startup" ++msgstr "Kdump будет включен при запуске" ++ ++#: ../org_fedora_oscap/rule_handling.py:905 ++msgid "Firewall will be disabled on startup" ++msgstr "Брандмауэр будет отключен при запуске" ++ ++#: ../org_fedora_oscap/rule_handling.py:912 ++msgid "Firewall will be enabled on startup" ++msgstr "Брандмауэр будет включен при запуске" ++ ++#: ../org_fedora_oscap/rule_handling.py:920 ++#: ../org_fedora_oscap/rule_handling.py:957 ++#, 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:927 ++#: ../org_fedora_oscap/rule_handling.py:968 ++#, 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 ++#, 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:988 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#, 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:196 ++msgid "_SECURITY POLICY" ++msgstr "_ПОЛИТИКА БЕЗОПАСНОСТИ" ++ ++#. the first status provided ++#: ../org_fedora_oscap/gui/spokes/oscap.py:221 ++msgid "Not ready" ++msgstr "Не готов" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:369 ++msgid "Fetching content data" ++msgstr "Получение данных контента" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:636 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1042 ++msgid "No profile selected" ++msgstr "Не выбран профиль" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:641 ++msgid "No rules for the pre-installation phase" ++msgstr "Нет правил для этапа предварительной установки" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:784 ++msgid "Invalid content provided. Enter a different URL, please." ++msgstr "Недопустимый контент. Введите другой URL-адрес, пожалуйста." ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:792 ++msgid "Invalid or unsupported content URL, please enter a different one." ++msgstr "Неверный или неподдерживаемый URL-адрес контента, введите другой." ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:800 ++msgid "Failed to fetch content. Enter a different URL, please." ++msgstr "Не удалось получить контент. Введите другой URL-адрес, пожалуйста." ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:808 ++msgid "" ++"Network error encountered when fetching data. Please check that network is " ++"setup and working." ++msgstr "" ++"Ошибка сети при сборе данных. Убедитесь, что сеть настроена и работает." ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:817 ++msgid "The integrity check of the content failed. Cannot use the content." ++msgstr "" ++"Не удалось проверить целостность содержимого. Невозможно использовать " ++"контент." ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:825 ++#, python-format ++msgid "Failed to extract content (%s). Enter a different URL, please." ++msgstr "" ++"Не удалось извлечь контент (%s). Введите другой URL-адрес, пожалуйста." ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:843 ++#, 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:859 ++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 ++msgid " or enter data stream content or archive URL below:" ++msgstr " или введите содержимое потока данных или URL-адрес архива ниже:" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:894 ++msgid "" ++"No content found. Please enter data stream content or archive URL below:" ++msgstr "" ++"Контент не найден. Введите содержимое потока данных или URL-адрес архива " ++"ниже:" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1032 ++msgid "Error fetching and loading content" ++msgstr "Ошибка получения и загрузки содержимого" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 ++msgid "No content found" ++msgstr "Не найдено ни одного контента" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 ++msgid "Misconfiguration detected" ++msgstr "Обнаружено несоответствие" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++msgid "Warnings appeared" ++msgstr "Появились предупреждения" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 ++msgid "Everything okay" ++msgstr "Все в порядке" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 ++msgid "Invalid or unsupported URL" ++msgstr "Недействительный или неподдерживаемый URL" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 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 1970-01-01 01:00:00.000000000 +0100 +@@ -1,278 +0,0 @@ +-# SOME DESCRIPTIVE TITLE. +-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +-# This file is distributed under the same license as the PACKAGE package. +-# +-# Translators: +-# Momcilo Medic , 2014 +-# Momcilo Medic , 2015. #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-04-18 01:39+0000\n" +-"Last-Translator: Momcilo Medic \n" +-"Language-Team: Serbian (http://www.transifex.com/projects/p/oscap-anaconda-addon/language/sr/)\n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" +-"Language: sr\n" +-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +-"X-Generator: Zanata 4.4.5\n" +- +-#: ../org_fedora_oscap/rule_handling.py:392 +-#, python-brace-format +-msgid "" +-"{0} must be on a separate partition or logical volume and has to be created " +-"in the partitioning layout before installation can occur with a security " +-"profile" +-msgstr "" +- +-#. template for the message +-#: ../org_fedora_oscap/rule_handling.py:403 +-#, 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:502 +-#, python-format +-msgid "make sure to create password with minimal length of %d characters" +-msgstr "изаберите шифру од најмање %d карактера" +- +-#: ../org_fedora_oscap/rule_handling.py:509 +-msgid "cannot check root password length (password is crypted)" +-msgstr "немогуће проверити дужину root шифре (шифра је криптована)" +- +-#. too short +-#: ../org_fedora_oscap/rule_handling.py:515 +-#, 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 +-#, 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 +-#, python-format +-msgid "package '%s' has been added to the list of excluded packages" +-msgstr "пакет '%s' је додат на листу искључених пакета" +- +-#: ../org_fedora_oscap/rule_handling.py:756 +-msgid "Kdump will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:758 +-msgid "Kdump will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:905 +-msgid "Firewall will be disabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:912 +-msgid "Firewall will be enabled on startup" +-msgstr "" +- +-#: ../org_fedora_oscap/rule_handling.py:920 +-#: ../org_fedora_oscap/rule_handling.py:957 +-#, 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 +-#, 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 +-#, 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 +-#, 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 +-#, python-format +-msgid "" +-"There was an error fetching and loading the security content:\n" +-"%s\n" +-"The installation should be aborted. Do you wish to continue anyway?" +-msgstr "" +- +-#: ../org_fedora_oscap/ks/oscap.py: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:196 +-msgid "_SECURITY POLICY" +-msgstr "_БЕЗБЕДНОСНИ МОДЕЛ" +- +-#. the first status provided +-#: ../org_fedora_oscap/gui/spokes/oscap.py:221 +-msgid "Not ready" +-msgstr "Није спремно" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:369 +-msgid "Fetching content data" +-msgstr "Преузимање података о садржају" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:636 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1042 +-msgid "No profile selected" +-msgstr "Није изабран профил" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-msgid "No rules for the pre-installation phase" +-msgstr "Нема правила за пред-инсталациону фазу" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:784 +-msgid "Invalid content provided. Enter a different URL, please." +-msgstr "Неисправан садржај пружен. Унесите други URL, молим." +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:792 +-msgid "Invalid or unsupported content URL, please enter a different one." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:800 +-msgid "Failed to fetch content. Enter a different URL, please." +-msgstr "Неуспешно преузимање садржаја. Унесите други URL, молим." +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:808 +-msgid "" +-"Network error encountered when fetching data. Please check that network is " +-"setup and working." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:817 +-msgid "The integrity check of the content failed. Cannot use the content." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:825 +-#, python-format +-msgid "Failed to extract content (%s). Enter a different URL, please." +-msgstr "Неуспешно извлачење садржаја (%s). Унесите други URL, молим." +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:843 +-#, 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 +-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 +-msgid " or enter data stream content or archive URL below:" +-msgstr "или унесите садржајни или архивски URL за stream података испод:" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:894 +-msgid "" +-"No content found. Please enter data stream content or archive URL below:" +-msgstr "" +-"Садржај није пронађен. Молим унесите садржајни или архивски URL за stream " +-"података:" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1032 +-msgid "Error fetching and loading content" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 +-msgid "No content found" +-msgstr "Садржај није пронађен" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 +-msgid "Misconfiguration detected" +-msgstr "Погрешно подешавање откривено" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-msgid "Warnings appeared" +-msgstr "Упозорења су се појавила" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 +-msgid "Everything okay" +-msgstr "Све је у реду" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 +-msgid "Invalid or unsupported URL" +-msgstr "Неисправан или неподржан URL" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 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 "Stream података:" +- +-#: 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/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 1970-01-01 01:00:00.000000000 +0100 +@@ -1,286 +0,0 @@ +-# Yuri Chornoivan , 2015. +-# Yuri Chornoivan , 2018. #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: 2018-07-02 03:40+0000\n" +-"Last-Translator: Yuri Chornoivan \n" +-"Language-Team: Ukrainian \n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" +-"Language: uk\n" +-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +-"X-Generator: Zanata 4.4.5\n" +- +-#: ../org_fedora_oscap/rule_handling.py:392 +-#, 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:403 +-#, 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:502 +-#, python-format +-msgid "make sure to create password with minimal length of %d characters" +-msgstr "довжина пароля має бути не меншою за %d символів" +- +-#: ../org_fedora_oscap/rule_handling.py:509 +-msgid "cannot check root password length (password is crypted)" +-msgstr "не вдалося перевірити довжину пароля root (пароль зашифровано)" +- +-#. too short +-#: ../org_fedora_oscap/rule_handling.py:515 +-#, 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:619 +-#: ../org_fedora_oscap/rule_handling.py:634 +-#, 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 +-#, python-format +-msgid "package '%s' has been added to the list of excluded packages" +-msgstr "до списку виключених пакунків додано пакунок «%s»" +- +-#: ../org_fedora_oscap/rule_handling.py:756 +-msgid "Kdump will be disabled on startup" +-msgstr "Kdump буде вимкнено при запуску" +- +-#: ../org_fedora_oscap/rule_handling.py:758 +-msgid "Kdump will be enabled on startup" +-msgstr "Kdump буде увімкнено при запуску" +- +-#: ../org_fedora_oscap/rule_handling.py:905 +-msgid "Firewall will be disabled on startup" +-msgstr "Брандмауер буде вимкнено при запуску" +- +-#: ../org_fedora_oscap/rule_handling.py:912 +-msgid "Firewall will be enabled on startup" +-msgstr "Брандмауер буде увімкнено при запуску" +- +-#: ../org_fedora_oscap/rule_handling.py:920 +-#: ../org_fedora_oscap/rule_handling.py:957 +-#, 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:927 +-#: ../org_fedora_oscap/rule_handling.py:968 +-#, 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 +-#, 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:988 +-#: ../org_fedora_oscap/rule_handling.py:1003 +-#, 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:196 +-msgid "_SECURITY POLICY" +-msgstr "П_РАВИЛА ЗАХИСТУ" +- +-#. the first status provided +-#: ../org_fedora_oscap/gui/spokes/oscap.py:221 +-msgid "Not ready" +-msgstr "Неготовий" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:369 +-msgid "Fetching content data" +-msgstr "Отримуємо дані" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:636 +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1042 +-msgid "No profile selected" +-msgstr "Не вибрано жодного профілю" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:641 +-msgid "No rules for the pre-installation phase" +-msgstr "Правил для кроку перед встановленням немає" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:784 +-msgid "Invalid content provided. Enter a different URL, please." +-msgstr "Надано некоректні дані. Будь ласка, вкажіть іншу адресу." +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:792 +-msgid "Invalid or unsupported content URL, please enter a different one." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:800 +-msgid "Failed to fetch content. Enter a different URL, please." +-msgstr "Не вдалося отримати дані. Будь ласка, вкажіть іншу адресу." +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:808 +-msgid "" +-"Network error encountered when fetching data. Please check that network is " +-"setup and working." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:817 +-msgid "The integrity check of the content failed. Cannot use the content." +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:825 +-#, python-format +-msgid "Failed to extract content (%s). Enter a different URL, please." +-msgstr "Не вдалося видобути дані (%s). Будь ласка, вкажіть іншу адресу." +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:843 +-#, 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 +-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 +-msgid " or enter data stream content or archive URL below:" +-msgstr " або вкажіть адресу потоку даних чи архіву:" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:894 +-msgid "" +-"No content found. Please enter data stream content or archive URL below:" +-msgstr "" +-"Даних не знайдено. Будь ласка, вкажіть адресу потоку даних або архіву:" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1032 +-msgid "Error fetching and loading content" +-msgstr "" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 +-msgid "No content found" +-msgstr "Даних не знайдено" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 +-msgid "Misconfiguration detected" +-msgstr "Виявлено помилки у налаштуваннях" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 +-msgid "Warnings appeared" +-msgstr "Отримано попередження" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 +-msgid "Everything okay" +-msgstr "Все гаразд" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 +-msgid "Invalid or unsupported URL" +-msgstr "Некоректна або непідтримувана адреса" +- +-#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 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 "_Отримати" +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-02-13 12:55:08.614070613 +0100 +@@ -0,0 +1,273 @@ ++# Ludek Janda , 2018. #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: 2018-11-21 11:52+0000\n" ++"Last-Translator: Copied by Zanata \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:392 ++#, 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:403 ++#, 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:502 ++#, python-format ++msgid "make sure to create password with minimal length of %d characters" ++msgstr "确保创建的密码长度最少为 %d 个字符" ++ ++#: ../org_fedora_oscap/rule_handling.py:509 ++msgid "cannot check root password length (password is crypted)" ++msgstr "无法检查 root 密码的长度（密码已加密）" ++ ++#. too short ++#: ../org_fedora_oscap/rule_handling.py:515 ++#, 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:619 ++#: ../org_fedora_oscap/rule_handling.py:634 ++#, 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 ++#, python-format ++msgid "package '%s' has been added to the list of excluded packages" ++msgstr "软件包 '%s' 已被添加到排除的软件包列表中" ++ ++#: ../org_fedora_oscap/rule_handling.py:756 ++msgid "Kdump will be disabled on startup" ++msgstr "Kdump 将在启动时被禁用" ++ ++#: ../org_fedora_oscap/rule_handling.py:758 ++msgid "Kdump will be enabled on startup" ++msgstr "Kdump 将在启动时被启用" ++ ++#: ../org_fedora_oscap/rule_handling.py:905 ++msgid "Firewall will be disabled on startup" ++msgstr "防火墙将在启动时被禁用" ++ ++#: ../org_fedora_oscap/rule_handling.py:912 ++msgid "Firewall will be enabled on startup" ++msgstr "防火墙将在启动时被启用" ++ ++#: ../org_fedora_oscap/rule_handling.py:920 ++#: ../org_fedora_oscap/rule_handling.py:957 ++#, 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:927 ++#: ../org_fedora_oscap/rule_handling.py:968 ++#, 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 ++#, 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:988 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#, 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:196 ++msgid "_SECURITY POLICY" ++msgstr "安全策略（_S）：" ++ ++#. the first status provided ++#: ../org_fedora_oscap/gui/spokes/oscap.py:221 ++msgid "Not ready" ++msgstr "未就绪" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:369 ++msgid "Fetching content data" ++msgstr "获取内容数据" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:636 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1042 ++msgid "No profile selected" ++msgstr "没有选择 profile" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:641 ++msgid "No rules for the pre-installation phase" ++msgstr "没有预安装阶段的规则" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:784 ++msgid "Invalid content provided. Enter a different URL, please." ++msgstr "提供无效的内容。请输入一个不同的 URL。" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:792 ++msgid "Invalid or unsupported content URL, please enter a different one." ++msgstr "无效或不支持的内容 URL，请输入一个不同的 URL。" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:800 ++msgid "Failed to fetch content. Enter a different URL, please." ++msgstr "获取内容失败。请输入一个不同的 URL。" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:808 ++msgid "" ++"Network error encountered when fetching data. Please check that network is " ++"setup and working." ++msgstr "在获取数据时出现网络错误。请检查网络是否正常。" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:817 ++msgid "The integrity check of the content failed. Cannot use the content." ++msgstr "内容的完整性检查失败。不能使用这个内容。" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:825 ++#, python-format ++msgid "Failed to extract content (%s). Enter a different URL, please." ++msgstr "提取内容 (%s) 失败。请输入一个不同的 URL。" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:843 ++#, 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:859 ++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 ++msgid " or enter data stream content or archive URL below:" ++msgstr "或输入数据流内容或归档 URL：" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:894 ++msgid "" ++"No content found. Please enter data stream content or archive URL below:" ++msgstr "没有找到内容。请输入数据流或归档 URL：" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1032 ++msgid "Error fetching and loading content" ++msgstr "获取并加载内容错误" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 ++msgid "No content found" ++msgstr "没有找到内容" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 ++msgid "Misconfiguration detected" ++msgstr "发现错误配置" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++msgid "Warnings appeared" ++msgstr "出现的警告" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 ++msgid "Everything okay" ++msgstr "一切正常" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 ++msgid "Invalid or unsupported URL" ++msgstr "无效或不支持的 URL" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 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)" +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-02-13 12:55:08.614070613 +0100 +@@ -0,0 +1,269 @@ ++# 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: 2019-01-15 11:26+0000\n" ++"Last-Translator: Copied by Zanata \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:392 ++#, 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:403 ++#, 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:502 ++#, python-format ++msgid "make sure to create password with minimal length of %d characters" ++msgstr "確保以最小的長度創建密碼 %d 人物" ++ ++#: ../org_fedora_oscap/rule_handling.py:509 ++msgid "cannot check root password length (password is crypted)" ++msgstr "無法檢查root密碼長度（密碼被加密）" ++ ++#. too short ++#: ../org_fedora_oscap/rule_handling.py:515 ++#, 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:619 ++#: ../org_fedora_oscap/rule_handling.py:634 ++#, 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 ++#, python-format ++msgid "package '%s' has been added to the list of excluded packages" ++msgstr "包'%s'已添加到已排除的包列表中" ++ ++#: ../org_fedora_oscap/rule_handling.py:756 ++msgid "Kdump will be disabled on startup" ++msgstr "Kdump將在啟動時被禁用" ++ ++#: ../org_fedora_oscap/rule_handling.py:758 ++msgid "Kdump will be enabled on startup" ++msgstr "Kdump將在啟動時啟用" ++ ++#: ../org_fedora_oscap/rule_handling.py:905 ++msgid "Firewall will be disabled on startup" ++msgstr "防火牆將在啟動時禁用" ++ ++#: ../org_fedora_oscap/rule_handling.py:912 ++msgid "Firewall will be enabled on startup" ++msgstr "防火牆將在啟動時啟用" ++ ++#: ../org_fedora_oscap/rule_handling.py:920 ++#: ../org_fedora_oscap/rule_handling.py:957 ++#, 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:927 ++#: ../org_fedora_oscap/rule_handling.py:968 ++#, 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 ++#, 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:988 ++#: ../org_fedora_oscap/rule_handling.py:1003 ++#, 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:196 ++msgid "_SECURITY POLICY" ++msgstr "安全政策（_S）" ++ ++#. the first status provided ++#: ../org_fedora_oscap/gui/spokes/oscap.py:221 ++msgid "Not ready" ++msgstr "沒有準備好" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:369 ++msgid "Fetching content data" ++msgstr "獲取內容數據" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:636 ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1042 ++msgid "No profile selected" ++msgstr "沒有選擇個人資料" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:641 ++msgid "No rules for the pre-installation phase" ++msgstr "沒有預安裝階段的規則" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:784 ++msgid "Invalid content provided. Enter a different URL, please." ++msgstr "提供的內容無效。請輸入其他網址。" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:792 ++msgid "Invalid or unsupported content URL, please enter a different one." ++msgstr "無效或不受支持的內容網址，請輸入其他網址。" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:800 ++msgid "Failed to fetch content. Enter a different URL, please." ++msgstr "無法獲取內容。請輸入其他網址。" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:808 ++msgid "" ++"Network error encountered when fetching data. Please check that network is " ++"setup and working." ++msgstr "獲取數據時遇到網絡錯誤。請檢查網絡是否已設置並正常運行。" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:817 ++msgid "The integrity check of the content failed. Cannot use the content." ++msgstr "內容的完整性檢查失敗。無法使用內容。" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:825 ++#, python-format ++msgid "Failed to extract content (%s). Enter a different URL, please." ++msgstr "無法提取內容（%s）。請輸入其他網址。" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:843 ++#, 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:859 ++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 ++msgid " or enter data stream content or archive URL below:" ++msgstr " 或輸入以下數據流內容或存檔URL：" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:894 ++msgid "" ++"No content found. Please enter data stream content or archive URL below:" ++msgstr "找不到任何內容。請在下面輸入數據流內容或存檔URL：" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1032 ++msgid "Error fetching and loading content" ++msgstr "獲取和加載內容時出錯" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1039 ++msgid "No content found" ++msgstr "找不到任何內容" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1050 ++msgid "Misconfiguration detected" ++msgstr "檢測到配置錯誤" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1056 ++msgid "Warnings appeared" ++msgstr "警告出現了" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1058 ++msgid "Everything okay" ++msgstr "一切都好" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1134 ++msgid "Invalid or unsupported URL" ++msgstr "網址無效或不受支持" ++ ++#: ../org_fedora_oscap/gui/spokes/oscap.py:1140 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）" diff --git a/SOURCES/oaa-api-update.patch b/SOURCES/oaa-api-update.patch new file mode 100644 index 0000000..8edb64e --- /dev/null +++ b/SOURCES/oaa-api-update.patch @@ -0,0 +1,256 @@ +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 new file mode 100644 index 0000000..8bd3dc4 --- /dev/null +++ b/SOURCES/rootpw.patch @@ -0,0 +1,68 @@ +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 new file mode 100644 index 0000000..7194f00 --- /dev/null +++ b/SOURCES/translate_spoke_title.patch @@ -0,0 +1,22 @@ +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 new file mode 100644 index 0000000..095ccd2 --- /dev/null +++ b/SPECS/oscap-anaconda-addon.spec @@ -0,0 +1,317 @@ +# Patch0 applies correctly but with mismatch and we dont't want backup file +%global _default_patch_flags --no-backup-if-mismatch + +Name: oscap-anaconda-addon +Version: 1.0 +Release: 9%{?dist} +Summary: Anaconda addon integrating OpenSCAP to the installation process + +License: GPLv2+ +URL: https://github.com/OpenSCAP/oscap-anaconda-addon + +# This is a Red Hat maintained package which is specific to +# our distribution. +# +# The source is thus available only from within this SRPM +# or via direct git checkout: +# git clone https://github.com/OpenSCAP/oscap-anaconda-addon.git +Source0: %{name}-%{version}.tar.gz +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 + +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 +Requires: python3-cpio +Requires: python3-pycurl +Requires: python3-kickstart +Requires: openscap openscap-utils openscap-python3 +Requires: scap-security-guide + +%description +This is an addon that integrates OpenSCAP utilities with the Anaconda installer +and allows installation of systems following restrictions given by a SCAP +content. + +%prep +%setup -q -n %{name}-%{version} + +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 + +%build + +#%check +#make test + + +%install +make install DESTDIR=%{buildroot} +%find_lang %{name} + +%files -f %{name}.lang +%{_datadir}/anaconda/addons/org_fedora_oscap + +%doc COPYING ChangeLog README.md + +%changelog +* Wed Feb 13 2019 Matěj Týč - 1.0-9 +- Updated translations: RHBZ#1645924 + +* Fri Feb 08 2019 Watson Yuuma Sato - 1.0-8 +- Fixed translation of spoke title: RHBZ#1673044 + +* Fri Jan 18 2019 Matěj Týč - 1.0-7 +- Fixed bootloader-related Anaconda API usage: RHBZ#1664036 +- Fixed root password-related Anaconda API usage: RHBZ#1665551 +- Fixed checksum-related Python2->3 issue: RHBZ#1665147 + +* Thu Jan 17 2019 Matěj Týč - 1.0-6 +- Updated translations: RHBZ#1645924 + +* Mon Dec 17 2018 Matěj Týč - 1.0-5 +- Applied the HelpFile -> help_id patch + +* Fri Dec 14 2018 Matěj Týč - 1.0-4 +- Updated translations: RHBZ#1608331, RHBZ#1645924 + +* Wed Oct 10 2018 Matěj Týč - 1.0-3 +- Updated to the latest Anaconda API: RHBZ#1637635 +- Added updated translations: RHBZ#1608331 + +* Mon Oct 01 2018 Matěj Týč - 1.0-2 +- Added the missing pycurl dependency. + +* Tue Jul 03 2018 Matěj Týč - 1.0-1 +- Rebased to upstream version 1.0 +- Python3 support, anaconda 28 support. + +* Tue Dec 12 2017 Watson Yuuma Sato - 0.8-3 +- Return empty string when there is no tailoring file + Resolves: rhbz#1520276 + +* Mon Dec 11 2017 Watson Sato - 0.8-2 +- Add japanese translation +- Update other translations + Resolves: rhbz#1481190 +- Fix selection of RHEL datastream + Resolves: rhbz#1520358 + +* Mon Nov 27 2017 Watson Sato - 0.8-1 +- Rebase to the upstream version 0.8 + Related: rhbz#1472419 + +* Tue May 30 2017 Watson Sato - 0.7-15 +- Add japanese translation +- Update other translations + Resolves: rhbz#1383181 + +* Thu Apr 20 2017 Raphael Sanchez Prudencio - 0.7-14 +- Fixed gtk warning messages when anaconda is starting. + Resolves: rhbz#1437106 + +* Tue Mar 28 2017 Martin Preisler - 0.7-13 +- Avoid long delay before a GeoIP related timeout in case internet is not available + Resolves: rhbz#1379479 + +* Tue Sep 13 2016 Vratislav Podzimek - 0.7-12 +- Properly handle tailoring files for datastreams + Resolves: rhbz#1364929 + +* Thu Aug 25 2016 Vratislav Podzimek - 0.7-11 +- Don't require blank stderr when running the oscap tool + Resolves: rhbz#1360765 +- Beware of the invalid profiles + Resolves: rhbz#1365130 +- Properly set the seen property for root passwords + Resolves: rhbz#1357603 + +* Thu Jun 30 2016 Vratislav Podzimek - 0.7-10 +- Clear spoke's info before setting an error + Resolves: rhbz#1349446 + +* Wed Jun 1 2016 Vratislav Podzimek - 0.7-9 +- Use the System hub category provided by Anaconda + Resolves: rhbz#1269211 +- Wait for Anaconda to settle before evaluation + Resolves: rhbz#1265552 +- Make the changes overview scrollable and smaller + Related: rhbz#1263582 +- Make the list of profiles scrollable + Resolves: rhbz#1263582 +- Do not try to create a single file multiple times + Related: rhbz#1263315 +- Avoid crashes on extraction errors + Resolves: rhbz#1263315 +- Disable GPG checks when installing content to the system + Resolves: rhbz#1263216 +- Allow fixing root password in graphical installations + Resolves: rhbz#1265116 +- Enforce the minimal root password length + Resolves: rhbz#1238281 +- Just report misconfiguration instead of crashing in text mode + Resolves: rhbz#1263207 +- Do not verify SSL if inst.noverifyssl was given + Resolves: rhbz#1263257 +- Also catch data_fetch.DataFetchError when trying to get content + Resolves: rhbz#1263239 +- Use new method signature with payload class + Related: rhbz#1288636 + +* Wed Sep 16 2015 Vratislav Podzimek - 0.7-8 +- Do not remove the root password behind user's back + Resolves: rhbz#1263254 + +* Mon Sep 7 2015 Vratislav Podzimek - 0.7-7 +- Completely skip the execute() part if no profile is selected + Resolves: rhbz#1254973 + +* Mon Aug 24 2015 Vratislav Podzimek - 0.7-6 +- Specify the name of the help content file + Resolves: rhbz#1254884 +- Skip files unrecognized by the 'oscap info' command + Resolves: rhbz#1255075 +- Only allow DS and XCCDF ID selection if it makes sense + Resolves: rhbz#1254876 + +* Tue Aug 4 2015 Vratislav Podzimek - 0.7-5 +- Make sure DS and XCCDF ID lists are correctly refreshed + Resolves: rhbz#1240946 +- Make sure the DS and XCCDF ID combo boxes are visible for DS content + Resolves: rhbz#1249951 +- Try to load the OSCAP session early for DS content + Resolves: rhbz#1247654 +- Test preinst_content_path before raw_preinst_content_path + Resolves: rhbz#1249937 +- Clear any error if switching to the dry-run mode + Related: rhbz#1247677 +- Do not continue with and invalid profile ID + Resolves: rhbz#1247677 +- Cover all potential places with a non-main thread changing Gtk stuff + Resolves: rhbz#1240967 + +* Thu Jul 23 2015 Vratislav Podzimek - 0.7-4 +- Better handle and report erroneous states + Resolves: rhbz#1241064 +- Make sure (some more) GUI actions run in the main thread + Resolves: rhbz#1240967 +- Beware of RPM->cpio entries' paths having absolute paths + Related: rhbz#1241064 +- Only output the kickstart section with content and profile set + Resolves: rhbz#1241395 +- Just report integrity check failure instead of traceback + Resolves: rhbz#1240710 +- Properly react on download/loading issues in text+kickstart mode + Related: rhbz#1240710 +- Fetch and process the content even if GUI doesn't take care of it + Resolves: rhbz#1240625 + +* Tue Jul 7 2015 Vratislav Podzimek - 0.7-3 +- Do not output redundant/invalid fields for the SSG content (vpodzime) + Resolves: rhbz#1240285 +- Better handle unsupported URL types (vpodzime) + Resolves: rhbz#1232631 +- React better on network issues (vpodzime) + Resolves: rhbz#1236657 +- Improve the description of the default profile (vpodzime) + Resolves: rhbz#1238080 +- Use the openscap-scanner package instead of openscap-utils (vpodzime) + Resolves: rhbz#1240249 +- Better handle the case with no profile selected (vpodzime) + Resolves: rhbz#1235750 +- Add newline and one blank line after the %%addon section (vpodzime) + Resolves: rhbz#1238267 +- Word-wrap profile descriptions (vpodzime) + Resolves: rhbz#1236644 + +* Wed Jun 17 2015 Vratislav Podzimek - 0.7-2 +- Add gettext to BuildRequires (vpodzime) + Related: rhbz#1204640 + +* Tue Jun 16 2015 Vratislav Podzimek - 0.7-1 +- Rebase to the upstream version 0.7 + Related: rhbz#1204640 + +* Tue Apr 28 2015 Vratislav Podzimek - 0.6-1 +- Rebase to the upstream version 0.6 + Resolves: rhbz#1204640 + +* Mon Aug 04 2014 Vratislav Podzimek - 0.4-3 +- Don't distribute backup files + Resolves: rhbz#1065906 +* Wed Jan 15 2014 Vratislav Podizmek - 0.4-2 +- Skip running tests on RHEL builds + Related: rhbz#1035662 +* Tue Jan 14 2014 Vratislav Podzimek - 0.4-1 +- Beware of running Gtk actions from a non-main thread +- Fix path to the tailoring file when getting rules +- A git hook for running tests when pushing +- Inform user if no profile is selected +- Visually mark the selected profile +- Better UX with content URL entry and progress label +- React on invalid content properly (#1032846) +- Stop spinner when data fetching is finished +- Make the data fetching thread non-fatal (#1049989) +- Exit code 2 from the oscap tool is not an error for us (#1050913) +- Be ready to work with archives/RPMs containing data streams +- Add unit tests for the keep_type_map function +- Add support for namedtuples to keep_type_map +- Add target for running pylint check +- Add target for running just unittests +- On the way to tailoring +- Tests for kickstart XCCDF tailoring handling +- Kickstart support for XCCDF tailoring +- Check session validity also when using XCCDF benchmark + +* Tue Dec 10 2013 Vratislav Podzimek - 0.3-1 +- Implement and use our own better function for joining paths +- The content entry should have focus if there is no content +- RPM is just a weird archive in the pre-installation phase +- Ignore RPM files as well +- Adapt tests to dir constants now ending with "/" +- CpioArchive cannot be created from a piped output +- Fix namespace definitions in the testing XCCDF file +- Prevent putting None into xccdf_session_is_sds +- Fix the __all__ variable in the common module +- Strip content dir prefix when setting xccdf/cpe paths +- Inform user we now support archive URLs as well +- Ignore various file types in the git repository +- Try to find content files in the fetched archive or RPM +- Run pylint -E as part of the test target +- Return list of extracted files/directories when extracting archive +- Do not try to search for empty file paths in archives +- Properly set the content type based on the URL's suffix +- Switch profiles on double-click +- Hook urlEntry's activate signal to fetchButton click +- Save the spoke's glade file with a new Glade +- The addon now requires the python-cpio package +- Use really_hide for the UI elements for datastream-id and xccdf-id +- Support for RPM content in the GUI spoke +- RPM content support for kickstart processing +- Add property for the raw post-installation content path +- Make content type case insensitive +- Rest of the code needed for RPM extraction +- Actually look for the file path in entry names +- Basic stuff needed for the RPM content support +- Run tests in paralel +- Specify files in a better way in spec + +* Mon Oct 21 2013 Vratislav Podzimek - 0.2-1 +- Initial RPM for the oscap-anaconda-addon