From fe707e7d419d763bf55e40d2d0dd06e9555d5c91 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 02 2022 20:11:50 +0000 Subject: import oscap-anaconda-addon-1.2.1-8.el8 --- diff --git a/SOURCES/lang.patch b/SOURCES/lang.patch index 7749593..9dd03e4 100644 --- a/SOURCES/lang.patch +++ b/SOURCES/lang.patch @@ -1,6 +1,6 @@ diff -U3 -N -r a/po/de.po b/po/de.po --- a/po/de.po 2021-07-30 15:17:14.000000000 +0200 -+++ b/po/de.po 2022-01-21 16:53:28.986191551 +0100 ++++ b/po/de.po 2022-07-20 13:28:31.143478128 +0200 @@ -1,11 +1,12 @@ # Ludek Janda , 2019. #zanata, 2021. +# Ettore Atalan , 2021. @@ -36,7 +36,7 @@ diff -U3 -N -r a/po/de.po b/po/de.po #, python-brace-format diff -U3 -N -r a/po/fr.po b/po/fr.po --- a/po/fr.po 2021-07-30 15:17:14.000000000 +0200 -+++ b/po/fr.po 2022-01-21 16:53:28.986191551 +0100 ++++ b/po/fr.po 2022-07-20 13:28:31.143478128 +0200 @@ -8,45 +8,47 @@ # Ludek Janda , 2018. #zanata # Ludek Janda , 2019. #zanata @@ -144,7 +144,7 @@ diff -U3 -N -r a/po/fr.po b/po/fr.po #: ../org_fedora_oscap/gui/spokes/oscap.py:201 diff -U3 -N -r a/po/hr.po b/po/hr.po --- a/po/hr.po 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/hr.po 2022-01-21 16:53:28.986191551 +0100 ++++ b/po/hr.po 2022-07-20 13:28:31.143478128 +0200 @@ -0,0 +1,329 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -477,7 +477,7 @@ diff -U3 -N -r a/po/hr.po b/po/hr.po +msgstr "_Preuzmi" diff -U3 -N -r a/po/ja.po b/po/ja.po --- a/po/ja.po 2021-07-30 15:17:14.000000000 +0200 -+++ b/po/ja.po 2022-01-21 16:53:28.986191551 +0100 ++++ b/po/ja.po 2022-07-20 13:28:31.143478128 +0200 @@ -1,6 +1,6 @@ -# Ludek Janda , 2017. #zanata -# Ludek Janda , 2018. #zanata @@ -584,9 +584,58 @@ diff -U3 -N -r a/po/ja.po b/po/ja.po #. the first status provided #: ../org_fedora_oscap/gui/spokes/oscap.py:229 +diff -U3 -N -r a/po/ko.po b/po/ko.po +--- a/po/ko.po 2021-07-30 15:17:14.000000000 +0200 ++++ b/po/ko.po 2022-07-20 13:28:31.143478128 +0200 +@@ -1,13 +1,14 @@ + # Ludek Janda , 2018. #zanata + # Ludek Janda , 2020. #zanata + # simmon , 2021. ++# 김인수 , 2022. + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2021-06-21 11:51+0200\n" +-"PO-Revision-Date: 2021-07-06 15:04+0000\n" +-"Last-Translator: simmon \n" ++"PO-Revision-Date: 2022-05-14 13:18+0000\n" ++"Last-Translator: 김인수 \n" + "Language-Team: Korean \n" + "Language: ko\n" +@@ -15,7 +16,7 @@ + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=1; plural=0;\n" +-"X-Generator: Weblate 4.7.1\n" ++"X-Generator: Weblate 4.12.2\n" + + #: ../org_fedora_oscap/common.py:326 + #, python-brace-format +@@ -87,8 +88,8 @@ + "can't be removed from the current software selection without breaking the " + "installation." + msgstr "" +-"꾸러미 '{package}'가 제외된 꾸러미 목록에 추가되었지만 설치를 중단하지 않고 " +-"현재 소프트웨어 선택에서 제거할 수 없습니다." ++"꾸러미 '{package}'가 제외된 꾸러미 목록에 추가되었지만, 설치를 중단하지 않고 " ++"현재 소프트웨어 선택에서 제거 할 수 없습니다." + + #: ../org_fedora_oscap/rule_handling.py:717 + #: ../org_fedora_oscap/rule_handling.py:732 +@@ -148,7 +149,7 @@ + + #: ../org_fedora_oscap/ks/oscap.py:377 + msgid "Do you wish to continue anyway?" +-msgstr "계속 진행 할까요?" ++msgstr "계속 진행할까요?" + + #: ../org_fedora_oscap/ks/oscap.py:400 + msgid "The integrity check of the security content failed." diff -U3 -N -r a/po/si.po b/po/si.po --- a/po/si.po 2021-07-30 15:17:14.000000000 +0200 -+++ b/po/si.po 2022-01-21 16:53:28.986191551 +0100 ++++ b/po/si.po 2022-07-20 13:28:31.143478128 +0200 @@ -7,13 +7,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" @@ -618,7 +667,7 @@ diff -U3 -N -r a/po/si.po b/po/si.po msgid "Fetching content data" diff -U3 -N -r a/po/sv.po b/po/sv.po --- a/po/sv.po 2021-07-30 15:17:14.000000000 +0200 -+++ b/po/sv.po 2022-01-21 16:53:28.986191551 +0100 ++++ b/po/sv.po 2022-07-20 13:28:31.144478135 +0200 @@ -1,12 +1,12 @@ -# Göran Uddeborg , 2019. #zanata, 2020. +# Göran Uddeborg , 2019. #zanata, 2020, 2021. @@ -699,13 +748,14 @@ diff -U3 -N -r a/po/sv.po b/po/sv.po msgid "Fetching content data" diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po --- a/po/zh_CN.po 2021-07-30 15:17:14.000000000 +0200 -+++ b/po/zh_CN.po 2022-01-21 16:53:28.986191551 +0100 -@@ -1,41 +1,42 @@ ++++ b/po/zh_CN.po 2022-07-20 13:28:31.144478135 +0200 +@@ -1,41 +1,43 @@ -# Ludek Janda , 2018. #zanata -# Ludek Janda , 2020. #zanata +# Ludek Janda , 2018. #zanata, 2021. +# Ludek Janda , 2020. #zanata, 2021. +# Sundeep Anand , 2021. ++# Transtats , 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -714,8 +764,8 @@ diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po -"PO-Revision-Date: 2020-06-26 04:26-0400\n" -"Last-Translator: Copied by Zanata \n" -"Language-Team: Chinese (Simplified)\n" -+"PO-Revision-Date: 2021-08-20 09:04+0000\n" -+"Last-Translator: Sundeep Anand \n" ++"PO-Revision-Date: 2022-05-07 06:18+0000\n" ++"Last-Translator: Transtats \n" +"Language-Team: Chinese (Simplified) \n" "Language: zh_CN\n" @@ -725,7 +775,7 @@ diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po -"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" ++"X-Generator: Weblate 4.12.1\n" #: ../org_fedora_oscap/common.py:326 #, python-brace-format @@ -756,7 +806,7 @@ diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po #: ../org_fedora_oscap/rule_handling.py:434 #, python-brace-format -@@ -142,34 +143,28 @@ +@@ -142,34 +144,28 @@ #: ../org_fedora_oscap/ks/oscap.py:376 msgid "The installation should be aborted." @@ -797,7 +847,16 @@ diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po #. title of the spoke (will be displayed on the hub) #: ../org_fedora_oscap/gui/spokes/oscap.py:201 -@@ -236,7 +231,7 @@ +@@ -188,7 +184,7 @@ + #: ../org_fedora_oscap/gui/spokes/oscap.py:626 + #: ../org_fedora_oscap/gui/spokes/oscap.py:1039 + msgid "No profile selected" +-msgstr "没有选择 profile" ++msgstr "没有选择配置文件" + + #: ../org_fedora_oscap/gui/spokes/oscap.py:631 + msgid "No rules for the pre-installation phase" +@@ -236,7 +232,7 @@ #. available #: ../org_fedora_oscap/gui/spokes/oscap.py:887 msgid " or enter data stream content or archive URL below:" @@ -806,3 +865,21 @@ diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po #: ../org_fedora_oscap/gui/spokes/oscap.py:891 tmp/oscap.glade.h:12 msgid "" +@@ -277,7 +273,7 @@ + + #: tmp/oscap.glade.h:2 + msgid "_Change content" +-msgstr "修改内容(_C)" ++msgstr "改变内容(_C)" + + #: tmp/oscap.glade.h:3 + msgid "Apply security policy:" +@@ -305,7 +301,7 @@ + + #: tmp/oscap.glade.h:9 + msgid "_Select profile" +-msgstr "选择档案(_S)" ++msgstr "选择配置文件(_S)" + + #: tmp/oscap.glade.h:10 + msgid "Changes that were done or need to be done:" diff --git a/SPECS/oscap-anaconda-addon.spec b/SPECS/oscap-anaconda-addon.spec index 614481a..3dd88eb 100644 --- a/SPECS/oscap-anaconda-addon.spec +++ b/SPECS/oscap-anaconda-addon.spec @@ -3,7 +3,7 @@ Name: oscap-anaconda-addon Version: 1.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Anaconda addon integrating OpenSCAP to the installation process License: GPLv2+ @@ -72,6 +72,10 @@ make install DESTDIR=%{buildroot} %doc COPYING ChangeLog README.md %changelog +* Wed Jul 20 2022 Matej Tyc - 1.2.1-8 +- Update translations + Resolves: rhbz#2062707 + * Fri Jun 10 2022 Matej Tyc - 1.2.1-7 - Remove the firstboot remediation feature completely. We can't have it, while maintaining the standard UX.