import oscap-anaconda-addon-2.0.0-4.el9
This commit is contained in:
commit
03f017a12d
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
SOURCES/addon-dbus-data.zip
|
||||
SOURCES/oscap-anaconda-addon-2.0.0.tar.gz
|
2
.oscap-anaconda-addon.metadata
Normal file
2
.oscap-anaconda-addon.metadata
Normal file
@ -0,0 +1,2 @@
|
||||
5645cafa41192e05989f7333db23e20bb7f35604 SOURCES/addon-dbus-data.zip
|
||||
d04955d3fcae16a86087af731e837d5ce06fe349 SOURCES/oscap-anaconda-addon-2.0.0.tar.gz
|
988
SOURCES/lang.patch
Normal file
988
SOURCES/lang.patch
Normal file
@ -0,0 +1,988 @@
|
||||
diff -U3 -N -r a/po/cs.po b/po/cs.po
|
||||
--- a/po/cs.po 2021-07-02 17:17:04.000000000 +0200
|
||||
+++ b/po/cs.po 2021-08-20 16:33:06.140497563 +0200
|
||||
@@ -13,7 +13,7 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2021-07-02 15:11+0000\n"
|
||||
+"PO-Revision-Date: 2021-07-13 13:04+0000\n"
|
||||
"Last-Translator: Matěj Týč <matyc@redhat.com>\n"
|
||||
"Language-Team: Czech <https://translate.fedoraproject.org/projects/"
|
||||
"oscap-anaconda-addon/rhel9-branch/cs/>\n"
|
||||
@@ -27,24 +27,24 @@
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
msgid "Error extracting archive as a zipfile: {exc}"
|
||||
-msgstr ""
|
||||
+msgstr "Nelze rozbalit archiv jako soubor zip: {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
-msgstr "Test integrity dat neprošel. Nelze použít tato data."
|
||||
+msgstr ""
|
||||
+"Test integrity dat neprošel - nesouhlasí kontrolní součet {hash_obj.name}"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "Ke stažení dat je třeba být připojen k síti."
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
-msgstr ""
|
||||
+msgstr "Nezdařilo se stažení dat - HTTP požadavek skončil chybou {return_code}"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:434
|
||||
#, python-brace-format
|
||||
@@ -154,34 +154,28 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr ""
|
||||
+msgstr "Instalaci byste měli ukončit."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
-msgstr ""
|
||||
+msgstr "Přejete si přesto pokračovat?"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
-#, fuzzy
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
msgid "The integrity check of the security content failed."
|
||||
-msgstr "Test integrity dat neprošel. Nelze použít tato data."
|
||||
+msgstr "Test integrity dat neprošel."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
-#, fuzzy
|
||||
-#| msgid "Error fetching and loading content"
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "Chyba při získávání a načítání dat"
|
||||
+msgstr "Chyba při získávání a načítání dat:\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
msgid "There was an unexpected problem with the supplied content."
|
||||
-msgstr ""
|
||||
+msgstr "Došlo k nečekanému problému s daty."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
-#, fuzzy
|
||||
-#| msgid "Misconfiguration detected"
|
||||
msgid "Wrong configuration detected!"
|
||||
-msgstr "Detekována nesprávná konfigurace"
|
||||
+msgstr "Detekována nesprávná konfigurace!"
|
||||
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
diff -U3 -N -r a/po/de.po b/po/de.po
|
||||
--- a/po/de.po 2021-07-02 17:17:04.000000000 +0200
|
||||
+++ b/po/de.po 2021-08-20 16:33:06.140497563 +0200
|
||||
@@ -4,15 +4,16 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2019-08-30 10:55-0400\n"
|
||||
+"PO-Revision-Date: 2021-07-13 13:04+0000\n"
|
||||
"Last-Translator: Ludek Janda <ljanda@redhat.com>\n"
|
||||
-"Language-Team: German\n"
|
||||
+"Language-Team: German <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel9-branch/de/>\n"
|
||||
"Language: de\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
|
||||
-"X-Generator: Zanata 4.6.2\n"
|
||||
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
+"X-Generator: Weblate 4.7.1\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
@@ -192,7 +193,7 @@
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
msgid "_Security Policy"
|
||||
-msgstr "_Sicherheitspolitik"
|
||||
+msgstr "_Sicherheitsrichtlinie"
|
||||
|
||||
#. the first status provided
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:229
|
||||
@@ -304,7 +305,7 @@
|
||||
|
||||
#: tmp/oscap.glade.h:1
|
||||
msgid "SECURITY POLICY"
|
||||
-msgstr "SICHERHEITSPOLITIK"
|
||||
+msgstr "SICHERHEITSRICHTLINIE"
|
||||
|
||||
#: tmp/oscap.glade.h:2
|
||||
msgid "_Change content"
|
||||
diff -U3 -N -r a/po/fi.po b/po/fi.po
|
||||
--- a/po/fi.po 2021-07-02 17:17:04.000000000 +0200
|
||||
+++ b/po/fi.po 2021-08-20 16:33:06.140497563 +0200
|
||||
@@ -7,38 +7,41 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2021-06-04 11:03+0000\n"
|
||||
-"Last-Translator: Ricky Tigg <ricky.tigg@gmail.com>\n"
|
||||
-"Language-Team: Finnish <https://translate.fedoraproject.org/projects/oscap-"
|
||||
-"anaconda-addon/rhel8-branch/fi/>\n"
|
||||
+"PO-Revision-Date: 2021-07-13 13:04+0000\n"
|
||||
+"Last-Translator: Jan Kuparinen <copper_fin@hotmail.com>\n"
|
||||
+"Language-Team: Finnish <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel9-branch/fi/>\n"
|
||||
"Language: fi\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
-"X-Generator: Weblate 4.6.2\n"
|
||||
+"X-Generator: Weblate 4.7.1\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
msgid "Error extracting archive as a zipfile: {exc}"
|
||||
-msgstr ""
|
||||
+msgstr "Virhe purettaessa arkistoa zip-tiedostona: {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
-msgstr "Sisällön eheyden tarkistus epäonnistui. Sisältöä ei voi käyttää."
|
||||
+msgstr ""
|
||||
+"Sisällön eheyden tarkistus epäonnistui. - {hash_obj.name} tarkiste ei ollut "
|
||||
+"oikein"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "Verkkoyhteys tarvitaan tiedonhakua varten."
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
msgstr ""
|
||||
+"Tietojen noutaminen epäonnistui - pyyntö palautti HTTP-virhekoodin "
|
||||
+"{return_code}"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:434
|
||||
#, python-brace-format
|
||||
@@ -150,34 +153,28 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr ""
|
||||
+msgstr "Asennus pitäisi keskeyttää."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
-msgstr ""
|
||||
+msgstr "Haluatko silti jatkaa?"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
-#, fuzzy
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
msgid "The integrity check of the security content failed."
|
||||
-msgstr "Sisällön eheyden tarkistus epäonnistui. Sisältöä ei voi käyttää."
|
||||
+msgstr "Sisällön tietoturvasisällön eheyden tarkistus epäonnistui."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
-#, fuzzy
|
||||
-#| msgid "Error fetching and loading content"
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "Virhe sisällön noutamisessa ja lataamisessa"
|
||||
+msgstr "Sattui virhe tietoturvasisällön noutamisessa ja lataamisessa:\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
msgid "There was an unexpected problem with the supplied content."
|
||||
-msgstr ""
|
||||
+msgstr "Toimitetun sisällön kohdalla oli odottamaton ongelma."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
-#, fuzzy
|
||||
-#| msgid "Misconfiguration detected"
|
||||
msgid "Wrong configuration detected!"
|
||||
-msgstr "Virheellinen määritys havaittu"
|
||||
+msgstr "Virheellinen määritys havaittu!"
|
||||
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
diff -U3 -N -r a/po/fr.po b/po/fr.po
|
||||
--- a/po/fr.po 2021-07-02 17:17:04.000000000 +0200
|
||||
+++ b/po/fr.po 2021-08-20 16:33:06.140497563 +0200
|
||||
@@ -13,40 +13,41 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2020-06-26 04:26-0400\n"
|
||||
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
|
||||
-"Language-Team: French (http://www.transifex.com/projects/p/oscap-anaconda-"
|
||||
-"addon/language/fr/)\n"
|
||||
+"PO-Revision-Date: 2021-08-20 09:04+0000\n"
|
||||
+"Last-Translator: Ludek Janda <ljanda@redhat.com>\n"
|
||||
+"Language-Team: French <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel9-branch/fr/>\n"
|
||||
"Language: fr\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||
-"X-Generator: Zanata 4.6.2\n"
|
||||
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
|
||||
+"X-Generator: Weblate 4.7.2\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
msgid "Error extracting archive as a zipfile: {exc}"
|
||||
-msgstr ""
|
||||
+msgstr "Erreur d'extraction de l'archive en tant que fichier zip : {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
msgstr ""
|
||||
-"Le contrôle d'intégrité du contenu a échoué. Impossible d'utiliser le "
|
||||
-"contenu."
|
||||
+"Le contrôle d'intégrité du contenu a échoué - le hachage de {hash_obj.name} "
|
||||
+"ne correspond pas"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "Connexion réseau nécessaire pour récupérer les données."
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
msgstr ""
|
||||
+"Impossible de récupérer les données - la demande a renvoyé un code d'erreur "
|
||||
+"HTTP {return_code}"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:434
|
||||
#, python-brace-format
|
||||
@@ -165,36 +166,30 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr ""
|
||||
+msgstr "L'installation doit être interrompue."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
-msgstr ""
|
||||
+msgstr "Voulez-vous malgré tout continuer ?"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
-#, fuzzy
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
msgid "The integrity check of the security content failed."
|
||||
-msgstr ""
|
||||
-"Le contrôle d'intégrité du contenu a échoué. Impossible d'utiliser le "
|
||||
-"contenu."
|
||||
+msgstr "La vérification de l'intégrité du contenu sécurité a échoué."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
-#, fuzzy
|
||||
-#| msgid "Error fetching and loading content"
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "Erreur d'extraction et de chargement du contenu"
|
||||
+msgstr ""
|
||||
+"Une erreur s'est produite lors de la récupération et du chargement du "
|
||||
+"contenu sécurité :\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
msgid "There was an unexpected problem with the supplied content."
|
||||
-msgstr ""
|
||||
+msgstr "Il y a eu un problème inattendu avec le contenu fourni."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
-#, fuzzy
|
||||
-#| msgid "Misconfiguration detected"
|
||||
msgid "Wrong configuration detected!"
|
||||
-msgstr "Mauvaise configuration détectée"
|
||||
+msgstr "Mauvaise configuration détectée !"
|
||||
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
diff -U3 -N -r a/po/ja.po b/po/ja.po
|
||||
--- a/po/ja.po 2021-07-02 17:17:04.000000000 +0200
|
||||
+++ b/po/ja.po 2021-08-20 16:33:06.140497563 +0200
|
||||
@@ -8,38 +8,37 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2021-04-07 16:02+0000\n"
|
||||
-"Last-Translator: simmon <simmon@nplob.com>\n"
|
||||
-"Language-Team: Japanese <https://translate.fedoraproject.org/projects/oscap-"
|
||||
-"anaconda-addon/rhel8-branch/ja/>\n"
|
||||
+"PO-Revision-Date: 2021-08-20 09:04+0000\n"
|
||||
+"Last-Translator: Ludek Janda <ljanda@redhat.com>\n"
|
||||
+"Language-Team: Japanese <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel9-branch/ja/>\n"
|
||||
"Language: ja\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
-"X-Generator: Weblate 4.5.3\n"
|
||||
+"X-Generator: Weblate 4.7.2\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
msgid "Error extracting archive as a zipfile: {exc}"
|
||||
-msgstr ""
|
||||
+msgstr "アーカイブを zip ファイルとして抽出する際にエラーが発生しました: {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
-msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。"
|
||||
+msgstr "コンテンツの整合性チェックに失敗しました。{hash_obj.name} ハッシュが一致しませんでした"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "データの取得に必要なネットワーク接続。"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
-msgstr ""
|
||||
+msgstr "データの取得に失敗しました。返された HTTP エラーコード {return_code}"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:434
|
||||
#, python-brace-format
|
||||
@@ -152,39 +151,33 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr ""
|
||||
+msgstr "インストールを中止する必要があります。"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
-msgstr ""
|
||||
+msgstr "それでも続行しますか?"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
-#, fuzzy
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
msgid "The integrity check of the security content failed."
|
||||
-msgstr "コンテンツの整合性チェックに失敗しました。コンテンツを使用できません。"
|
||||
+msgstr "セキュリティーコンテンツの整合性チェックに失敗しました。"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
-#, fuzzy
|
||||
-#| msgid "Error fetching and loading content"
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "コンテンツの取得およびロードのエラー"
|
||||
+msgstr "セキュリティーコンテンツの取得およびロード時にエラーが発生しました:\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
msgid "There was an unexpected problem with the supplied content."
|
||||
-msgstr ""
|
||||
+msgstr "指定のコンテンツで予期しない問題が発生しました。"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
-#, fuzzy
|
||||
-#| msgid "Misconfiguration detected"
|
||||
msgid "Wrong configuration detected!"
|
||||
-msgstr "設定ミスが検出されました"
|
||||
+msgstr "設定が正しく検出されました!"
|
||||
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
msgid "_Security Policy"
|
||||
-msgstr "セキュリティーポリシ"
|
||||
+msgstr "セキュリティーポリシー(_S)"
|
||||
|
||||
#. the first status provided
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:229
|
||||
@@ -240,9 +233,7 @@
|
||||
msgid ""
|
||||
"Profile with ID '%s' not defined in the content. Select a different profile, "
|
||||
"please"
|
||||
-msgstr ""
|
||||
-"コンテンツで ID が '%s' のプロファイルが定義されていません。別のプロファイル"
|
||||
-"を選択してください"
|
||||
+msgstr "コンテンツで ID が '%s' のプロファイルが定義されていません。別のプロファイルを選択してください"
|
||||
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:856
|
||||
msgid "Not applying security policy"
|
||||
@@ -252,16 +243,12 @@
|
||||
#. available
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:887
|
||||
msgid " or enter data stream content or archive URL below:"
|
||||
-msgstr ""
|
||||
-" または、以下にデータストリームコンテンツもしくはアーカイブの URL を入力しま"
|
||||
-"す:"
|
||||
+msgstr " または、以下にデータストリームコンテンツもしくはアーカイブの URL を入力します:"
|
||||
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12
|
||||
msgid ""
|
||||
"No content found. Please enter data stream content or archive URL below:"
|
||||
-msgstr ""
|
||||
-"コンテンツが見つかりませんでした。以下にデータストリームコンテンツもしくは"
|
||||
-"アーカイブの URL を入力してください:"
|
||||
+msgstr "コンテンツが見つかりませんでした。以下にデータストリームコンテンツもしくはアーカイブの URL を入力してください:"
|
||||
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:1029
|
||||
msgid "Error fetching and loading content"
|
||||
diff -U3 -N -r a/po/ko.po b/po/ko.po
|
||||
--- a/po/ko.po 2021-07-02 17:17:04.000000000 +0200
|
||||
+++ b/po/ko.po 2021-08-20 16:33:06.140497563 +0200
|
||||
@@ -6,38 +6,37 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2021-04-02 07:02+0000\n"
|
||||
+"PO-Revision-Date: 2021-07-06 15:04+0000\n"
|
||||
"Last-Translator: simmon <simmon@nplob.com>\n"
|
||||
-"Language-Team: Korean <https://translate.fedoraproject.org/projects/oscap-"
|
||||
-"anaconda-addon/rhel8-branch/ko/>\n"
|
||||
+"Language-Team: Korean <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel9-branch/ko/>\n"
|
||||
"Language: ko\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
-"X-Generator: Weblate 4.5.3\n"
|
||||
+"X-Generator: Weblate 4.7.1\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
msgid "Error extracting archive as a zipfile: {exc}"
|
||||
-msgstr ""
|
||||
+msgstr "zipfile로 압축 해제 중 오류가 발생하였습니다: {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
-msgstr "내용 무결성 검사에 실패했습니다. 내용을 사용 할 수 없습니다."
|
||||
+msgstr "내용 무결성 검사에 실패 - {hash_obj.name} 해쉬가 일치하지 않습니다"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "자료를 가져올 때에 네트워크 연결이 필요합니다."
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
-msgstr ""
|
||||
+msgstr "자료 가져오기에 실패 - 요청은 HTTP 오류 코드 {return_code}를 반환했습니다"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:434
|
||||
#, python-brace-format
|
||||
@@ -145,34 +144,28 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr ""
|
||||
+msgstr "설치가 중지되었습니다."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
-msgstr ""
|
||||
+msgstr "계속 진행 할까요?"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
-#, fuzzy
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
msgid "The integrity check of the security content failed."
|
||||
-msgstr "내용 무결성 검사에 실패했습니다. 내용을 사용 할 수 없습니다."
|
||||
+msgstr "보안 내용의 무결성 검사가 실패했습니다."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
-#, fuzzy
|
||||
-#| msgid "Error fetching and loading content"
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "내용 가져오기와 적재 오류"
|
||||
+msgstr "가져오기와 보안 내용 적재 중에 오류가 발생하였습니다:\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
msgid "There was an unexpected problem with the supplied content."
|
||||
-msgstr ""
|
||||
+msgstr "제시된 내용에 예상치 못한 문제가 있습니다."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
-#, fuzzy
|
||||
-#| msgid "Misconfiguration detected"
|
||||
msgid "Wrong configuration detected!"
|
||||
-msgstr "설정 오류가 감지되었습니다"
|
||||
+msgstr "잘못된 구성이 감지되었습니다!"
|
||||
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
diff -U3 -N -r a/po/pl.po b/po/pl.po
|
||||
--- a/po/pl.po 2021-07-02 17:17:04.000000000 +0200
|
||||
+++ b/po/pl.po 2021-08-20 16:33:06.140497563 +0200
|
||||
@@ -26,40 +26,42 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2020-09-07 11:29+0000\n"
|
||||
+"PO-Revision-Date: 2021-07-05 13:04+0000\n"
|
||||
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
|
||||
-"Language-Team: Polish <https://translate.fedoraproject.org/projects/oscap-"
|
||||
-"anaconda-addon/rhel8-branch/pl/>\n"
|
||||
+"Language-Team: Polish <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel9-branch/pl/>\n"
|
||||
"Language: pl\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
|
||||
"|| n%100>=20) ? 1 : 2;\n"
|
||||
-"X-Generator: Weblate 4.2.2\n"
|
||||
+"X-Generator: Weblate 4.7.1\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
msgid "Error extracting archive as a zipfile: {exc}"
|
||||
-msgstr ""
|
||||
+msgstr "Błąd podczas rozpakowywania archiwum jako pliku ZIP: {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
msgstr ""
|
||||
-"Sprawdzenie integralności treści się nie powiodło. Nie można użyć treści."
|
||||
+"Sprawdzenie integralności treści się nie powiodło — suma {hash_obj.name} się "
|
||||
+"nie zgadza"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "Do pobrania danych wymagane jest połączenie sieciowe."
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
msgstr ""
|
||||
+"Pobranie danych się nie powiodło — żądanie zwróciło kod błędu HTTP "
|
||||
+"{return_code}"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:434
|
||||
#, python-brace-format
|
||||
@@ -171,35 +173,28 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr ""
|
||||
+msgstr "Instalacja powinna zostać przerwana."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
-msgstr ""
|
||||
+msgstr "Kontynuować mimo to?"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
-#, fuzzy
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
msgid "The integrity check of the security content failed."
|
||||
-msgstr ""
|
||||
-"Sprawdzenie integralności treści się nie powiodło. Nie można użyć treści."
|
||||
+msgstr "Sprawdzenie integralności treści bezpieczeństwa się nie powiodło."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
-#, fuzzy
|
||||
-#| msgid "Error fetching and loading content"
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "Błąd podczas pobierania i wczytywania treści"
|
||||
+msgstr "Wystąpił błąd podczas pobierania i wczytywania treści bezpieczeństwa:\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
msgid "There was an unexpected problem with the supplied content."
|
||||
-msgstr ""
|
||||
+msgstr "Wystąpił nieoczekiwany problem z dostarczoną treścią."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
-#, fuzzy
|
||||
-#| msgid "Misconfiguration detected"
|
||||
msgid "Wrong configuration detected!"
|
||||
-msgstr "Wykryto błędną konfigurację"
|
||||
+msgstr "Wykryto błędną konfigurację."
|
||||
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
diff -U3 -N -r a/po/si.po b/po/si.po
|
||||
--- a/po/si.po 2021-07-02 17:17:04.000000000 +0200
|
||||
+++ b/po/si.po 2021-08-20 16:33:06.140497563 +0200
|
||||
@@ -7,13 +7,16 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
-"Last-Translator: Automatically generated\n"
|
||||
-"Language-Team: none\n"
|
||||
+"PO-Revision-Date: 2021-08-19 07:04+0000\n"
|
||||
+"Last-Translator: Hela Basa <r45xveza@pm.me>\n"
|
||||
+"Language-Team: Sinhala <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel9-branch/si/>\n"
|
||||
"Language: si\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
|
||||
+"X-Generator: Weblate 4.7.2\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
@@ -168,7 +171,7 @@
|
||||
#. the first status provided
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:229
|
||||
msgid "Not ready"
|
||||
-msgstr ""
|
||||
+msgstr "සූදානම් නැත"
|
||||
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:383
|
||||
msgid "Fetching content data"
|
||||
diff -U3 -N -r a/po/sv.po b/po/sv.po
|
||||
--- a/po/sv.po 2021-07-02 17:17:04.000000000 +0200
|
||||
+++ b/po/sv.po 2021-08-20 16:33:06.140497563 +0200
|
||||
@@ -4,40 +4,40 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2020-09-08 14:29+0000\n"
|
||||
+"PO-Revision-Date: 2021-08-07 20:04+0000\n"
|
||||
"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
|
||||
-"Language-Team: Swedish <https://translate.fedoraproject.org/projects/oscap-"
|
||||
-"anaconda-addon/rhel8-branch/sv/>\n"
|
||||
+"Language-Team: Swedish <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel9-branch/sv/>\n"
|
||||
"Language: sv\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
-"X-Generator: Weblate 4.2.2\n"
|
||||
+"X-Generator: Weblate 4.7.2\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
msgid "Error extracting archive as a zipfile: {exc}"
|
||||
-msgstr ""
|
||||
+msgstr "Fel vid extrahering av arkiv som zipfil: {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
msgstr ""
|
||||
-"Integritetskontrollen av innehållet misslyckades. Kan inte använda "
|
||||
-"innehållet."
|
||||
+"Integritetskontrollen av innehållet misslyckades – {hash_obj.name}-hachen "
|
||||
+"stämmer inte"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "Nätverksanslutning behövs för att hämta data."
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
msgstr ""
|
||||
+"Det gick inte att hämta data - begäran returnerade HTTP-felkod {return_code}"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:434
|
||||
#, python-brace-format
|
||||
@@ -140,7 +140,7 @@
|
||||
msgid ""
|
||||
"trust '%s' has been added to the list of trusts to be added to the firewall"
|
||||
msgstr ""
|
||||
-"förtroendet ”%s” har lagts till till listan över förtoenden att läggas till "
|
||||
+"förtroendet ”%s” har lagts till till listan över förtroenden att läggas till "
|
||||
"i brandväggen"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:1080
|
||||
@@ -155,36 +155,28 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr ""
|
||||
+msgstr "Installationen bör avbrytas."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
-msgstr ""
|
||||
+msgstr "Vill du fortsätta ändå?"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
-#, fuzzy
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
msgid "The integrity check of the security content failed."
|
||||
-msgstr ""
|
||||
-"Integritetskontrollen av innehållet misslyckades. Kan inte använda "
|
||||
-"innehållet."
|
||||
+msgstr "Integritetskontrollen av säkerhetsinnehållet misslyckades."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
-#, fuzzy
|
||||
-#| msgid "Error fetching and loading content"
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "Fel när innehåll hämtades och laddades"
|
||||
+msgstr "Det uppstod ett fel när säkerhetsinnehåll hämtades och laddades:\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
msgid "There was an unexpected problem with the supplied content."
|
||||
-msgstr ""
|
||||
+msgstr "Det uppstod ett oväntat problem med det levererade innehållet."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
-#, fuzzy
|
||||
-#| msgid "Misconfiguration detected"
|
||||
msgid "Wrong configuration detected!"
|
||||
-msgstr "Felkonfiguration upptäckt"
|
||||
+msgstr "Felkonfiguration upptäckt!"
|
||||
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
@@ -194,7 +186,7 @@
|
||||
#. the first status provided
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:229
|
||||
msgid "Not ready"
|
||||
-msgstr "Inte redo"
|
||||
+msgstr "Inte klar"
|
||||
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:383
|
||||
msgid "Fetching content data"
|
||||
diff -U3 -N -r a/po/uk.po b/po/uk.po
|
||||
--- a/po/uk.po 2021-07-02 17:17:04.000000000 +0200
|
||||
+++ b/po/uk.po 2021-08-20 16:33:06.140497563 +0200
|
||||
@@ -5,39 +5,42 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2020-09-13 14:29+0000\n"
|
||||
+"PO-Revision-Date: 2021-07-02 15:16+0000\n"
|
||||
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
|
||||
-"Language-Team: Ukrainian <https://translate.fedoraproject.org/projects/oscap-"
|
||||
-"anaconda-addon/rhel8-branch/uk/>\n"
|
||||
+"Language-Team: Ukrainian <https://translate.fedoraproject.org/projects/"
|
||||
+"oscap-anaconda-addon/rhel9-branch/uk/>\n"
|
||||
"Language: uk\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
|
||||
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
-"X-Generator: Weblate 4.2.2\n"
|
||||
+"X-Generator: Weblate 4.7.1\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
msgid "Error extracting archive as a zipfile: {exc}"
|
||||
-msgstr ""
|
||||
+msgstr "Помилка під час спроби видобути дані з архіву як файла zip: {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
-msgstr "Дані не пройшли перевірку на цілісність. Їхнє використання неможливе."
|
||||
+msgstr ""
|
||||
+"Не пройдено перевірку цілісності даних — хеш {hash_obj.name} не збігається з "
|
||||
+"еталонним"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "Для отримання даних потрібне з'єднання з мережею."
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
msgstr ""
|
||||
+"Не вдалося отримати дані — у відповідь на запит отримано код помилки HTTP "
|
||||
+"{return_code}"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:434
|
||||
#, python-brace-format
|
||||
@@ -153,34 +156,29 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr ""
|
||||
+msgstr "Встановлення слід перервати."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
-msgstr ""
|
||||
+msgstr "Хочете продовжити попри це?"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
-#, fuzzy
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
msgid "The integrity check of the security content failed."
|
||||
-msgstr "Дані не пройшли перевірку на цілісність. Їхнє використання неможливе."
|
||||
+msgstr "Захищені дані не пройшли перевірку на цілісність."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
-#, fuzzy
|
||||
-#| msgid "Error fetching and loading content"
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "Помилка під час спроби отримання та завантаження даних"
|
||||
+msgstr ""
|
||||
+"Під час спроби отримання та завантаження захищених даних сталася помилка:\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
msgid "There was an unexpected problem with the supplied content."
|
||||
-msgstr ""
|
||||
+msgstr "Виникла непередбачена проблема із наданими даними."
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
-#, fuzzy
|
||||
-#| msgid "Misconfiguration detected"
|
||||
msgid "Wrong configuration detected!"
|
||||
-msgstr "Виявлено помилки у налаштуваннях"
|
||||
+msgstr "Виявлено помилкові налаштування!"
|
||||
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po
|
||||
--- a/po/zh_CN.po 2021-07-02 17:17:04.000000000 +0200
|
||||
+++ b/po/zh_CN.po 2021-08-20 16:33:06.140497563 +0200
|
||||
@@ -5,37 +5,37 @@
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-06-21 11:51+0200\n"
|
||||
-"PO-Revision-Date: 2020-06-26 04:26-0400\n"
|
||||
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
|
||||
-"Language-Team: Chinese (Simplified)\n"
|
||||
+"PO-Revision-Date: 2021-08-20 09:04+0000\n"
|
||||
+"Last-Translator: Sundeep Anand <suanand@redhat.com>\n"
|
||||
+"Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
|
||||
+"projects/oscap-anaconda-addon/rhel9-branch/zh_CN/>\n"
|
||||
"Language: zh_CN\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Plural-Forms: nplurals=1; plural=0\n"
|
||||
-"X-Generator: Zanata 4.6.2\n"
|
||||
+"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
+"X-Generator: Weblate 4.7.2\n"
|
||||
|
||||
#: ../org_fedora_oscap/common.py:326
|
||||
#, python-brace-format
|
||||
msgid "Error extracting archive as a zipfile: {exc}"
|
||||
-msgstr ""
|
||||
+msgstr "解压 zip 文件时出错: {exc}"
|
||||
|
||||
#: ../org_fedora_oscap/content_discovery.py:167
|
||||
-#, fuzzy, python-brace-format
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
+#, python-brace-format
|
||||
msgid ""
|
||||
"Integrity check of the content failed - {hash_obj.name} hash didn't match"
|
||||
-msgstr "内容的完整性检查失败。不能使用这个内容。"
|
||||
+msgstr "内容完整性检查失败 - {hash_obj.name} 哈希值不匹配"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:117
|
||||
msgid "Network connection needed to fetch data."
|
||||
-msgstr ""
|
||||
+msgstr "获取数据所需的网络连接。"
|
||||
|
||||
#: ../org_fedora_oscap/data_fetch.py:262
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"Failed to fetch data - the request returned HTTP error code {return_code}"
|
||||
-msgstr ""
|
||||
+msgstr "获取数据失败 - 请求返回 HTTP 错误代码 {return_code}"
|
||||
|
||||
#: ../org_fedora_oscap/rule_handling.py:434
|
||||
#, python-brace-format
|
||||
@@ -142,34 +142,28 @@
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:376
|
||||
msgid "The installation should be aborted."
|
||||
-msgstr ""
|
||||
+msgstr "安装应终止。"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:377
|
||||
msgid "Do you wish to continue anyway?"
|
||||
-msgstr ""
|
||||
+msgstr "您是否希望继续?"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:400
|
||||
-#, fuzzy
|
||||
-#| msgid "The integrity check of the content failed. Cannot use the content."
|
||||
msgid "The integrity check of the security content failed."
|
||||
-msgstr "内容的完整性检查失败。不能使用这个内容。"
|
||||
+msgstr "安全内容的完整性检查失败。"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:404
|
||||
-#, fuzzy
|
||||
-#| msgid "Error fetching and loading content"
|
||||
msgid "There was an error fetching and loading the security content:\n"
|
||||
-msgstr "获取并加载内容错误"
|
||||
+msgstr "获取并载入安全内容时出错:\n"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:409
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:774
|
||||
msgid "There was an unexpected problem with the supplied content."
|
||||
-msgstr ""
|
||||
+msgstr "提供的内容出现意外问题。"
|
||||
|
||||
#: ../org_fedora_oscap/ks/oscap.py:462
|
||||
-#, fuzzy
|
||||
-#| msgid "Misconfiguration detected"
|
||||
msgid "Wrong configuration detected!"
|
||||
-msgstr "发现错误配置"
|
||||
+msgstr "检测到配置错误!"
|
||||
|
||||
#. title of the spoke (will be displayed on the hub)
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:201
|
||||
@@ -236,7 +230,7 @@
|
||||
#. available
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:887
|
||||
msgid " or enter data stream content or archive URL below:"
|
||||
-msgstr "或输入数据流内容或归档 URL:"
|
||||
+msgstr " 或输入数据流内容或归档 URL:"
|
||||
|
||||
#: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12
|
||||
msgid ""
|
460
SOURCES/oscap-anaconda-addon-2.0.1-various_bugfixes-PR_166.patch
Normal file
460
SOURCES/oscap-anaconda-addon-2.0.1-various_bugfixes-PR_166.patch
Normal file
@ -0,0 +1,460 @@
|
||||
From aeb0e2ed5a524c5d4e5b72b2b11ea74a5119d45a Mon Sep 17 00:00:00 2001
|
||||
From: Matej Tyc <matyc@redhat.com>
|
||||
Date: Mon, 2 Aug 2021 17:23:17 +0200
|
||||
Subject: [PATCH 1/3] Improve logging
|
||||
|
||||
Make all log entries identifiable easily.
|
||||
---
|
||||
org_fedora_oscap/common.py | 4 ++--
|
||||
org_fedora_oscap/content_discovery.py | 16 +++++++++++-----
|
||||
org_fedora_oscap/gui/spokes/oscap.py | 19 ++++++++++++-------
|
||||
org_fedora_oscap/rule_handling.py | 8 ++++----
|
||||
org_fedora_oscap/service/installation.py | 6 +++---
|
||||
org_fedora_oscap/service/kickstart.py | 2 +-
|
||||
org_fedora_oscap/service/oscap.py | 12 ++++++------
|
||||
7 files changed, 39 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/org_fedora_oscap/common.py b/org_fedora_oscap/common.py
|
||||
index a307baa..c432168 100644
|
||||
--- a/org_fedora_oscap/common.py
|
||||
+++ b/org_fedora_oscap/common.py
|
||||
@@ -564,7 +564,7 @@ def get_content_name(data):
|
||||
def get_raw_preinst_content_path(data):
|
||||
"""Path to the raw (unextracted, ...) pre-installation content file"""
|
||||
if data.content_type == "scap-security-guide":
|
||||
- log.debug("Using scap-security-guide, no single content file")
|
||||
+ log.debug("OSCAP addon: Using scap-security-guide, no single content file")
|
||||
return None
|
||||
|
||||
content_name = get_content_name(data)
|
||||
@@ -667,7 +667,7 @@ def set_packages_data(data: PackagesConfigurationData):
|
||||
payload_proxy = get_payload_proxy()
|
||||
|
||||
if payload_proxy.Type != PAYLOAD_TYPE_DNF:
|
||||
- log.debug("The payload doesn't support packages.")
|
||||
+ log.debug("OSCAP addon: The payload doesn't support packages.")
|
||||
return
|
||||
|
||||
return payload_proxy.SetPackages(
|
||||
diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py
|
||||
index 894f3e1..bc14ef1 100644
|
||||
--- a/org_fedora_oscap/content_discovery.py
|
||||
+++ b/org_fedora_oscap/content_discovery.py
|
||||
@@ -98,7 +98,7 @@ def fetch_content(self, what_if_fail, ca_certs_path=""):
|
||||
def _fetch_files(self, scheme, path, destdir, ca_certs_path, what_if_fail):
|
||||
with self.activity_lock:
|
||||
if self.now_fetching_or_processing:
|
||||
- msg = "Strange, it seems that we are already fetching something."
|
||||
+ msg = "OSCAP Addon: Strange, it seems that we are already fetching something."
|
||||
log.warn(msg)
|
||||
return
|
||||
self.now_fetching_or_processing = True
|
||||
@@ -175,7 +175,7 @@ def finish_content_fetch(self, fetching_thread_name, fingerprint, report_callbac
|
||||
|
||||
def _verify_fingerprint(self, dest_filename, fingerprint=""):
|
||||
if not fingerprint:
|
||||
- log.info("No fingerprint provided, skipping integrity check")
|
||||
+ log.info("OSCAP Addon: No fingerprint provided, skipping integrity check")
|
||||
return
|
||||
|
||||
hash_obj = utils.get_hashing_algorithm(fingerprint)
|
||||
@@ -183,15 +183,19 @@ def _verify_fingerprint(self, dest_filename, fingerprint=""):
|
||||
hash_obj)
|
||||
if digest != fingerprint:
|
||||
log.error(
|
||||
+ "OSCAP Addon: "
|
||||
f"File {dest_filename} failed integrity check - assumed a "
|
||||
f"{hash_obj.name} hash and '{fingerprint}', got '{digest}'"
|
||||
)
|
||||
- msg = _(f"Integrity check of the content failed - {hash_obj.name} hash didn't match")
|
||||
+ msg = _(f"OSCAP Addon: Integrity check of the content failed - {hash_obj.name} hash didn't match")
|
||||
raise content_handling.ContentCheckError(msg)
|
||||
log.info(f"Integrity check passed using {hash_obj.name} hash")
|
||||
|
||||
def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_filename):
|
||||
- threadMgr.wait(wait_for)
|
||||
+ if wait_for:
|
||||
+ log.info(f"OSCAP Addon: Waiting for thread {wait_for}")
|
||||
+ threadMgr.wait(wait_for)
|
||||
+ log.info(f"OSCAP Addon: Finished waiting for thread {wait_for}")
|
||||
actually_fetched_content = wait_for is not None
|
||||
|
||||
if fingerprint and dest_filename:
|
||||
@@ -201,6 +205,7 @@ def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_file
|
||||
|
||||
structured_content = ObtainedContent(self.CONTENT_DOWNLOAD_LOCATION)
|
||||
content_type = self.get_content_type(str(dest_filename))
|
||||
+ log.info(f"OSCAP Addon: started to look at the content")
|
||||
if content_type in ("archive", "rpm"):
|
||||
structured_content.add_content_archive(dest_filename)
|
||||
|
||||
@@ -211,6 +216,7 @@ def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_file
|
||||
if fingerprint and dest_filename:
|
||||
structured_content.record_verification(dest_filename)
|
||||
|
||||
+ log.info(f"OSCAP Addon: finished looking at the content")
|
||||
return structured_content
|
||||
|
||||
def _gather_available_files(self, actually_fetched_content, dest_filename):
|
||||
@@ -232,7 +238,7 @@ def _gather_available_files(self, actually_fetched_content, dest_filename):
|
||||
)
|
||||
except common.ExtractionError as err:
|
||||
msg = f"Failed to extract the '{dest_filename}' archive: {str(err)}"
|
||||
- log.error(msg)
|
||||
+ log.error("OSCAP Addon: " + msg)
|
||||
raise err
|
||||
|
||||
elif content_type == "file":
|
||||
diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py
|
||||
index 76e508f..332e956 100644
|
||||
--- a/org_fedora_oscap/gui/spokes/oscap.py
|
||||
+++ b/org_fedora_oscap/gui/spokes/oscap.py
|
||||
@@ -331,6 +331,7 @@ def initialize(self):
|
||||
|
||||
# if no content was specified and SSG is available, use it
|
||||
if not self._policy_data.content_type and common.ssg_available():
|
||||
+ log.info("OSCAP Addon: Defaulting to local content")
|
||||
self._policy_data.content_type = "scap-security-guide"
|
||||
self._policy_data.content_path = common.SSG_DIR + common.SSG_CONTENT
|
||||
|
||||
@@ -351,7 +352,7 @@ def initialize(self):
|
||||
self._fetch_data_and_initialize()
|
||||
|
||||
def _handle_error(self, exception):
|
||||
- log.error(str(exception))
|
||||
+ log.error("OSCAP Addon: " + str(exception))
|
||||
if isinstance(exception, KickstartValueError):
|
||||
self._invalid_url()
|
||||
elif isinstance(exception, common.OSCAPaddonNetworkError):
|
||||
@@ -365,7 +366,7 @@ def _handle_error(self, exception):
|
||||
elif isinstance(exception, content_handling.ContentCheckError):
|
||||
self._integrity_check_failed()
|
||||
else:
|
||||
- log.exception("Unknown exception occurred", exc_info=exception)
|
||||
+ log.exception("OSCAP Addon: Unknown exception occurred", exc_info=exception)
|
||||
self._general_content_problem()
|
||||
|
||||
def _render_selected(self, column, renderer, model, itr, user_data=None):
|
||||
@@ -385,6 +386,7 @@ def _fetch_data_and_initialize(self):
|
||||
|
||||
thread_name = None
|
||||
if self._policy_data.content_url and self._policy_data.content_type != "scap-security-guide":
|
||||
+ log.info(f"OSCAP Addon: Actually fetching content from somewhere")
|
||||
thread_name = self.content_bringer.fetch_content(
|
||||
self._handle_error, self._policy_data.certificates)
|
||||
|
||||
@@ -442,7 +444,7 @@ def update_progress_label(msg):
|
||||
msg += f" with tailoring {preinst_tailoring_path}"
|
||||
else:
|
||||
msg += " without considering tailoring"
|
||||
- log.info(msg)
|
||||
+ log.info("OSCAP Addon: " + msg)
|
||||
|
||||
self._content_handler = scap_content_handler.SCAPContentHandler(
|
||||
preinst_content_path,
|
||||
@@ -456,7 +458,7 @@ def update_progress_label(msg):
|
||||
|
||||
return
|
||||
|
||||
- log.info("OAA: Done with analysis")
|
||||
+ log.info("OSCAP Addon: Done with analysis")
|
||||
|
||||
self._ds_checklists = self._content_handler.get_data_streams_checklists()
|
||||
if self._using_ds:
|
||||
@@ -592,7 +594,7 @@ def _update_profiles_store(self):
|
||||
try:
|
||||
profiles = self._content_handler.get_profiles()
|
||||
except scap_content_handler.SCAPContentHandlerError as e:
|
||||
- log.warning(str(e))
|
||||
+ log.warning("OSCAP Addon: " + str(e))
|
||||
self._invalid_content()
|
||||
|
||||
for profile in profiles:
|
||||
@@ -736,7 +738,7 @@ def _select_profile(self, profile_id):
|
||||
ds, xccdf, common.get_preinst_tailoring_path(self._policy_data))
|
||||
except common.OSCAPaddonError as exc:
|
||||
log.error(
|
||||
- "Failed to get rules for the profile '{}': {}"
|
||||
+ "OSCAP Addon: Failed to get rules for the profile '{}': {}"
|
||||
.format(profile_id, str(exc)))
|
||||
self._set_error(
|
||||
"Failed to get rules for the profile '{}'"
|
||||
@@ -908,6 +910,7 @@ def refresh(self):
|
||||
def _refresh_ui(self):
|
||||
"""Refresh the UI elements."""
|
||||
if not self._content_defined:
|
||||
+ log.info("OSCAP Addon: Content not defined")
|
||||
# hide the control buttons
|
||||
really_hide(self._control_buttons)
|
||||
|
||||
@@ -1156,7 +1159,9 @@ def on_fetch_button_clicked(self, *args):
|
||||
with self._fetch_flag_lock:
|
||||
if self._fetching:
|
||||
# some other fetching/pre-processing running, give up
|
||||
- log.warn("Clicked the fetch button, although the GUI is in the fetching mode.")
|
||||
+ log.warn(
|
||||
+ "OSCAP Addon: "
|
||||
+ "Clicked the fetch button, although the GUI is in the fetching mode.")
|
||||
return
|
||||
|
||||
# prevent user from changing the URL in the meantime
|
||||
diff --git a/org_fedora_oscap/rule_handling.py b/org_fedora_oscap/rule_handling.py
|
||||
index c478aa0..244aac8 100644
|
||||
--- a/org_fedora_oscap/rule_handling.py
|
||||
+++ b/org_fedora_oscap/rule_handling.py
|
||||
@@ -261,7 +261,7 @@ def new_rule(self, rule):
|
||||
try:
|
||||
actions[first_word](rule)
|
||||
except (ModifiedOptionParserException, KeyError) as e:
|
||||
- log.warning("Unknown OSCAP Addon rule '{}': {}".format(rule, e))
|
||||
+ log.warning("OSCAP Addon: Unknown OSCAP Addon rule '{}': {}".format(rule, e))
|
||||
|
||||
def eval_rules(self, ksdata, storage, report_only=False):
|
||||
""":see: RuleHandler.eval_rules"""
|
||||
@@ -565,7 +565,7 @@ def eval_rules(self, ksdata, storage, report_only=False):
|
||||
# root password set
|
||||
if users_proxy.IsRootPasswordCrypted:
|
||||
msg = _("cannot check root password length (password is crypted)")
|
||||
- log.warning("cannot check root password length (password is crypted)")
|
||||
+ log.warning("OSCAP Addon: cannot check root password length (password is crypted)")
|
||||
return [RuleMessage(self.__class__,
|
||||
common.MESSAGE_TYPE_WARNING, msg)]
|
||||
elif len(users_proxy.RootPassword) < self._minlen:
|
||||
@@ -880,7 +880,7 @@ def eval_rules(self, ksdata, storage, report_only=False):
|
||||
|
||||
kdump_proxy.KdumpEnabled = self._kdump_enabled
|
||||
else:
|
||||
- log.warning("com_redhat_kdump is not installed. "
|
||||
+ log.warning("OSCAP Addon: com_redhat_kdump is not installed. "
|
||||
"Skipping kdump configuration")
|
||||
|
||||
return messages
|
||||
@@ -894,7 +894,7 @@ def revert_changes(self, ksdata, storage):
|
||||
if self._kdump_enabled is not None:
|
||||
kdump_proxy.KdumpEnabled = self._kdump_default_enabled
|
||||
else:
|
||||
- log.warning("com_redhat_kdump is not installed. "
|
||||
+ log.warning("OSCAP Addon: com_redhat_kdump is not installed. "
|
||||
"Skipping reverting kdump configuration")
|
||||
|
||||
self._kdump_enabled = None
|
||||
diff --git a/org_fedora_oscap/service/installation.py b/org_fedora_oscap/service/installation.py
|
||||
index e3a1d0f..2da8559 100644
|
||||
--- a/org_fedora_oscap/service/installation.py
|
||||
+++ b/org_fedora_oscap/service/installation.py
|
||||
@@ -28,14 +28,14 @@
|
||||
from org_fedora_oscap.content_handling import ContentCheckError
|
||||
from org_fedora_oscap import content_discovery
|
||||
|
||||
-log = logging.getLogger(__name__)
|
||||
+log = logging.getLogger("anaconda")
|
||||
|
||||
|
||||
REQUIRED_PACKAGES = ("openscap", "openscap-scanner",)
|
||||
|
||||
|
||||
def _handle_error(exception):
|
||||
- log.error("Failed to fetch and initialize SCAP content!")
|
||||
+ log.error("OSCAP Addon: Failed to fetch and initialize SCAP content!")
|
||||
|
||||
if isinstance(exception, ContentCheckError):
|
||||
msg = _("The integrity check of the security content failed.")
|
||||
@@ -87,7 +87,7 @@ def run(self):
|
||||
|
||||
content = self.content_bringer.finish_content_fetch(
|
||||
fetching_thread_name, self._policy_data.fingerprint,
|
||||
- lambda msg: log.info(msg), content_dest, _handle_error)
|
||||
+ lambda msg: log.info("OSCAP Addon: " + msg), content_dest, _handle_error)
|
||||
|
||||
if not content:
|
||||
# this shouldn't happen because error handling is supposed to
|
||||
diff --git a/org_fedora_oscap/service/kickstart.py b/org_fedora_oscap/service/kickstart.py
|
||||
index 341c6c5..d6f22ac 100644
|
||||
--- a/org_fedora_oscap/service/kickstart.py
|
||||
+++ b/org_fedora_oscap/service/kickstart.py
|
||||
@@ -25,7 +25,7 @@
|
||||
from org_fedora_oscap import common, utils
|
||||
from org_fedora_oscap.structures import PolicyData
|
||||
|
||||
-log = logging.getLogger(__name__)
|
||||
+log = logging.getLogger("anaconda")
|
||||
|
||||
__all__ = ["OSCAPKickstartSpecification"]
|
||||
|
||||
diff --git a/org_fedora_oscap/service/oscap.py b/org_fedora_oscap/service/oscap.py
|
||||
index d491060..4237a47 100755
|
||||
--- a/org_fedora_oscap/service/oscap.py
|
||||
+++ b/org_fedora_oscap/service/oscap.py
|
||||
@@ -34,7 +34,7 @@
|
||||
from org_fedora_oscap.service.oscap_interface import OSCAPInterface
|
||||
from org_fedora_oscap.structures import PolicyData
|
||||
|
||||
-log = logging.getLogger(__name__)
|
||||
+log = logging.getLogger("anaconda")
|
||||
|
||||
__all__ = ["OSCAPService"]
|
||||
|
||||
@@ -71,7 +71,7 @@ def policy_enabled(self, value):
|
||||
"""
|
||||
self._policy_enabled = value
|
||||
self.policy_enabled_changed.emit()
|
||||
- log.debug("Policy enabled is set to '%s'.", value)
|
||||
+ log.debug("OSCAP Addon: Policy enabled is set to '%s'.", value)
|
||||
|
||||
@property
|
||||
def policy_data(self):
|
||||
@@ -89,7 +89,7 @@ def policy_data(self, value):
|
||||
"""
|
||||
self._policy_data = value
|
||||
self.policy_data_changed.emit()
|
||||
- log.debug("Policy data is set to '%s'.", value)
|
||||
+ log.debug("OSCAP Addon: Policy data is set to '%s'.", value)
|
||||
|
||||
@property
|
||||
def installation_enabled(self):
|
||||
@@ -150,7 +150,7 @@ def collect_requirements(self):
|
||||
:return: a list of requirements
|
||||
"""
|
||||
if not self.installation_enabled:
|
||||
- log.debug("The installation is disabled. Skip the requirements.")
|
||||
+ log.debug("OSCAP Addon: The installation is disabled. Skip the requirements.")
|
||||
return []
|
||||
|
||||
requirements = [
|
||||
@@ -180,7 +180,7 @@ def configure_with_tasks(self):
|
||||
:return: a list of tasks
|
||||
"""
|
||||
if not self.installation_enabled:
|
||||
- log.debug("The installation is disabled. Skip the configuration.")
|
||||
+ log.debug("OSCAP Addon: The installation is disabled. Skip the configuration.")
|
||||
return []
|
||||
|
||||
tasks = [
|
||||
@@ -205,7 +205,7 @@ def install_with_tasks(self):
|
||||
:return: a list of tasks
|
||||
"""
|
||||
if not self.installation_enabled:
|
||||
- log.debug("The installation is disabled. Skip the installation.")
|
||||
+ log.debug("OSCAP Addon: The installation is disabled. Skip the installation.")
|
||||
return []
|
||||
|
||||
tasks = [
|
||||
|
||||
From b081e32012b93177167d3f7d0cc2024deb50e965 Mon Sep 17 00:00:00 2001
|
||||
From: Matej Tyc <matyc@redhat.com>
|
||||
Date: Mon, 2 Aug 2021 17:24:15 +0200
|
||||
Subject: [PATCH 2/3] Save addon data when using local content
|
||||
|
||||
Addon loads its data from the shared storage upon refresh,
|
||||
which caused it to overwrite clicking on the "use SSG content" button.
|
||||
|
||||
Now the data is saved after clicking that button, and convenience
|
||||
load/save methods were introduced.
|
||||
---
|
||||
org_fedora_oscap/gui/spokes/oscap.py | 27 +++++++++++++++------------
|
||||
1 file changed, 15 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py
|
||||
index 332e956..4425757 100644
|
||||
--- a/org_fedora_oscap/gui/spokes/oscap.py
|
||||
+++ b/org_fedora_oscap/gui/spokes/oscap.py
|
||||
@@ -232,11 +232,8 @@ def __init__(self, data, storage, payload):
|
||||
# the proxy to OSCAP DBus module
|
||||
self._oscap_module = OSCAP.get_proxy()
|
||||
|
||||
- # the security policy data
|
||||
- self._policy_enabled = self._oscap_module.PolicyEnabled
|
||||
- self._policy_data = PolicyData.from_structure(
|
||||
- self._oscap_module.PolicyData
|
||||
- )
|
||||
+ self._policy_data = PolicyData()
|
||||
+ self._load_policy_data()
|
||||
|
||||
# used for changing profiles
|
||||
self._rule_data = None
|
||||
@@ -334,6 +331,7 @@ def initialize(self):
|
||||
log.info("OSCAP Addon: Defaulting to local content")
|
||||
self._policy_data.content_type = "scap-security-guide"
|
||||
self._policy_data.content_path = common.SSG_DIR + common.SSG_CONTENT
|
||||
+ self._save_policy_data()
|
||||
|
||||
if not self._content_defined:
|
||||
# nothing more to be done now, the spoke is ready
|
||||
@@ -351,6 +349,16 @@ def initialize(self):
|
||||
# else fetch data
|
||||
self._fetch_data_and_initialize()
|
||||
|
||||
+ def _save_policy_data(self):
|
||||
+ self._oscap_module.PolicyData = PolicyData.to_structure(self._policy_data)
|
||||
+ self._oscap_module.PolicyEnabled = self._policy_enabled
|
||||
+
|
||||
+ def _load_policy_data(self):
|
||||
+ self._policy_data.update_from(PolicyData.from_structure(
|
||||
+ self._oscap_module.PolicyData
|
||||
+ ))
|
||||
+ self._policy_enabled = self._oscap_module.PolicyEnabled
|
||||
+
|
||||
def _handle_error(self, exception):
|
||||
log.error("OSCAP Addon: " + str(exception))
|
||||
if isinstance(exception, KickstartValueError):
|
||||
@@ -897,13 +905,7 @@ def refresh(self):
|
||||
:see: pyanaconda.ui.common.UIObject.refresh
|
||||
|
||||
"""
|
||||
- # update the security policy data
|
||||
- self._policy_enabled = self._oscap_module.PolicyEnabled
|
||||
- fresh_data = PolicyData.from_structure(
|
||||
- self._oscap_module.PolicyData
|
||||
- )
|
||||
-
|
||||
- self._policy_data.update_from(fresh_data)
|
||||
+ self._load_policy_data()
|
||||
# update the UI elements
|
||||
self._refresh_ui()
|
||||
|
||||
@@ -1202,4 +1204,5 @@ def on_change_content_clicked(self, *args):
|
||||
|
||||
def on_use_ssg_clicked(self, *args):
|
||||
self.content_bringer.use_system_content()
|
||||
+ self._save_policy_data()
|
||||
self._fetch_data_and_initialize()
|
||||
|
||||
From fee170f54aeb9f649ab891781532012a7b069f8f Mon Sep 17 00:00:00 2001
|
||||
From: Matej Tyc <matyc@redhat.com>
|
||||
Date: Tue, 3 Aug 2021 11:01:59 +0200
|
||||
Subject: [PATCH 3/3] Refactor content identification
|
||||
|
||||
Don't use the multiprocessing pool - it sometimes creates probems during
|
||||
its initialization:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1989434
|
||||
---
|
||||
org_fedora_oscap/content_handling.py | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/org_fedora_oscap/content_handling.py b/org_fedora_oscap/content_handling.py
|
||||
index f2af22f..65d5a28 100644
|
||||
--- a/org_fedora_oscap/content_handling.py
|
||||
+++ b/org_fedora_oscap/content_handling.py
|
||||
@@ -111,9 +111,8 @@ def parse_HTML_from_content(content):
|
||||
|
||||
|
||||
def identify_files(fpaths):
|
||||
- with multiprocessing.Pool(os.cpu_count()) as p:
|
||||
- labels = p.map(get_doc_type, fpaths)
|
||||
- return {path: label for (path, label) in zip(fpaths, labels)}
|
||||
+ result = {path: get_doc_type(path) for path in fpaths}
|
||||
+ return result
|
||||
|
||||
|
||||
def get_doc_type(file_path):
|
||||
@@ -131,7 +130,9 @@ def get_doc_type(file_path):
|
||||
except UnicodeDecodeError:
|
||||
# 'oscap info' supplied weird output, which happens when it tries
|
||||
# to explain why it can't examine e.g. a JPG.
|
||||
- return None
|
||||
+ pass
|
||||
+ except Exception as e:
|
||||
+ log.warning(f"OSCAP addon: Unexpected error when looking at {file_path}: {str(e)}")
|
||||
log.info("OSCAP addon: Identified {file_path} as {content_type}"
|
||||
.format(file_path=file_path, content_type=content_type))
|
||||
return content_type
|
244
SPECS/oscap-anaconda-addon.spec
Normal file
244
SPECS/oscap-anaconda-addon.spec
Normal file
@ -0,0 +1,244 @@
|
||||
%if 0%{?rhel} == 8
|
||||
%define anaconda_core_version 33
|
||||
%endif
|
||||
%if 0%{?rhel} == 9
|
||||
%define anaconda_core_version 34
|
||||
%endif
|
||||
%if 0%{?fedora}
|
||||
%define anaconda_core_version %{fedora}
|
||||
%endif
|
||||
|
||||
Name: oscap-anaconda-addon
|
||||
Version: 2.0.0
|
||||
Release: 4%{?dist}
|
||||
Summary: Anaconda addon integrating OpenSCAP to the installation process
|
||||
|
||||
License: GPLv2+
|
||||
URL: https://github.com/OpenSCAP/oscap-anaconda-addon
|
||||
|
||||
Source0: https://github.com/OpenSCAP/oscap-anaconda-addon/releases/download/r%{version}/%{name}-%{version}.tar.gz
|
||||
# TODO: Remove when the fixed upstream release contains dbus service data
|
||||
Source1: addon-dbus-data.zip
|
||||
|
||||
Patch1: lang.patch
|
||||
Patch2: oscap-anaconda-addon-2.0.1-various_bugfixes-PR_166.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: make
|
||||
BuildRequires: gettext
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pycurl
|
||||
BuildRequires: openscap openscap-utils openscap-python3
|
||||
BuildRequires: anaconda-core >= %{anaconda_core_version}
|
||||
Requires: anaconda-core >= %{anaconda_core_version}
|
||||
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
|
||||
%autosetup -p1
|
||||
unzip %{_sourcedir}/addon-dbus-data.zip
|
||||
|
||||
%build
|
||||
|
||||
%check
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
%find_lang %{name}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%{_datadir}/anaconda/addons/org_fedora_oscap
|
||||
%{_datadir}/anaconda/dbus/confs/org.fedoraproject.Anaconda.Addons.OSCAP.conf
|
||||
%{_datadir}/anaconda/dbus/services/org.fedoraproject.Anaconda.Addons.OSCAP.service
|
||||
|
||||
%doc COPYING ChangeLog README.md
|
||||
|
||||
%changelog
|
||||
* Fri Aug 20 2021 Matej Tyc <matyc@redhat.com> - 2.0.0-4
|
||||
- Update translations
|
||||
Resolves: rhbz#1962112
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.0-3
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Tue Aug 03 2021 Matej Tyc <matyc@redhat.com> - 2.0.0-2
|
||||
- Fix issues with locally installed content and labelling of discovered content.
|
||||
- Resolves: rhbz#1989434
|
||||
|
||||
* Fri Jul 02 2021 Matej Tyc <matyc@redhat.com> - 2.0.0-1
|
||||
- Rebase to the 2.0.0 upstream release.
|
||||
- Remove the cpio dependency which is not needed any more.
|
||||
|
||||
* Wed Jun 23 2021 Jan Černý <jcerny@redhat.com> - 1.0-11
|
||||
- Rebuild after test config change in test.yml
|
||||
|
||||
* Mon Jun 14 2021 Matej Tyc <matyc@redhat.com> - 1.0-10
|
||||
- Unified the spec file with the Fedora one.
|
||||
- Removed unwanted dependencies.
|
||||
- nose is not needed for a long time.
|
||||
- mock has been moved into the Python standard library, so it is also not needed.
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0-9
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Aug 12 2019 Matěj Týč <matyc@redhat.com> - 1.0-5
|
||||
- Disabled execution of tests, as they are not meant to be executed in the build environment.
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jul 03 2018 Matěj Týč <matyc@redhat.com> - 1.0-1
|
||||
- Rebased to upstream version 1.0
|
||||
- Python3 support, anaconda 28 support.
|
||||
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.7-7
|
||||
- Escape macros in %%changelog
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.7-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Wed Jan 07 2015 Vratislav Podzimek <vpodzime@redhat.com> - 0.7-1
|
||||
- Adapt to changes in Anaconda
|
||||
- Define name of the spoke window
|
||||
- Set fetching flag to False when extraction error happens
|
||||
- Remove code that was pushed to the anaconda's sources
|
||||
|
||||
* Fri Feb 28 2014 Vratislav Podzimek <vpodzime@redhat.com> - 0.6-2
|
||||
- Rebuild with building issues fixed
|
||||
|
||||
* Fri Feb 28 2014 Vratislav Podzimek <vpodzime@redhat.com> - 0.6-1
|
||||
- Getting status needs to run in the main thread
|
||||
- Grab focus for the URL entry after switching notebook page
|
||||
- Clear rule data when unselecting profile
|
||||
- Update message as part of the initialization
|
||||
- Add BuildRequires: gettext
|
||||
- Include translations in the tarball and RPM
|
||||
|
||||
* Fri Feb 28 2014 Vratislav Podzimek <vpodzime@redhat.com> - 0.5-1
|
||||
- Allow users to change content
|
||||
- Show and hide control buttons properly
|
||||
- Fix sensitivity of the URL entry and fetch button
|
||||
- Add the button allowing users to use SSG content if available
|
||||
- Fix listing python sources when creating potfile and regenerate it
|
||||
- Omit the %%addon section from kickstart in dry-run mode
|
||||
- Implement the dry-run mode in the GUI (trac#2)
|
||||
- Add UI elements for content changing and dry-run mode
|
||||
- Check content_defined instead of content_url in the GUI code
|
||||
- First select the profile, then update the message store
|
||||
- Remove unused import
|
||||
- Ignore some more temporary/backup files
|
||||
- If no content is specified and SSG is available, use it
|
||||
- New special content type -- SCAP Security Guide
|
||||
- Fix name of the property used when doing fingerprint check
|
||||
- Get rid of an unused variable
|
||||
- Fix data fetch locking to work properly with kickstart installations
|
||||
- Use 'anonymous:' if no username and password is given for FTP
|
||||
- Initial version of the translations template file
|
||||
- First steps to dry-run mode
|
||||
- Fix main notebook tabs
|
||||
- Make translations work
|
||||
- Manipulation with the i18n related files
|
||||
- If no profile is given, default to default
|
||||
- Ignore updates.img and its auxiliary directory
|
||||
- Catch only fetching errors from the fetching thread
|
||||
- Do not allow multiple simultaneous fetches/initializations
|
||||
- Prevent user from changing the URL while we try to fetch from it
|
||||
- Add support for the Default profile
|
||||
- Support FTP as a content source (#1050980)
|
||||
- React properly on archive extraction failure
|
||||
- Refactor the code pre-processing the fetched content
|
||||
- Unify exceptions from archive extraction
|
||||
- Make pylint check mandatory to pass
|
||||
- Support for hash based content integrity checking
|
||||
|
||||
* Tue Jan 14 2014 Vratislav Podzimek <vpodzime@redhat.com> - 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 <vpodzime@redhat.com> - 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 <vpodzime@redhat.com> - 0.2-1
|
||||
- Initial RPM for the oscap-anaconda-addon
|
Loading…
Reference in New Issue
Block a user