From b4d5456cc8318d88d891b1601ce8d5c157b17303 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 9 May 2023 05:36:51 +0000 Subject: [PATCH] import dnf-plugins-core-4.3.0-5.el9_2 --- .dnf-plugins-core.metadata | 2 +- .gitignore | 2 +- ...upgrade-plugin-to-core-RhBug-2054235.patch | 1711 ++++++++++ ...chroots-for-CentOS-Stream-RhBug-2058.patch | 37 - ...ng-when-using-system-upgrade-on-RHEL.patch | 78 + SOURCES/0002-Update-translations.patch | 2786 ----------------- ...offline-upgrade-Add-security-filters.patch | 61 + ...Show-warning-always-for-a-downstream.patch | 62 + SOURCES/0005-Update-translations.patch | 2782 ++++++++++++++++ SPECS/dnf-plugins-core.spec | 71 +- 10 files changed, 4759 insertions(+), 2833 deletions(-) create mode 100644 SOURCES/0001-Move-system-upgrade-plugin-to-core-RhBug-2054235.patch delete mode 100644 SOURCES/0001-copr-Guess-EPEL-chroots-for-CentOS-Stream-RhBug-2058.patch create mode 100644 SOURCES/0002-Add-a-warning-when-using-system-upgrade-on-RHEL.patch delete mode 100644 SOURCES/0002-Update-translations.patch create mode 100644 SOURCES/0003-offline-upgrade-Add-security-filters.patch create mode 100644 SOURCES/0004-system-upgrade-Show-warning-always-for-a-downstream.patch create mode 100644 SOURCES/0005-Update-translations.patch diff --git a/.dnf-plugins-core.metadata b/.dnf-plugins-core.metadata index 89f436d..a3b145a 100644 --- a/.dnf-plugins-core.metadata +++ b/.dnf-plugins-core.metadata @@ -1 +1 @@ -22fcfa23b92ea8052ba2eb14ef9264e61c4b7d8b SOURCES/dnf-plugins-core-4.1.0.tar.gz +d9a1561a5c4d238340b3db6d081c70b86841c291 SOURCES/dnf-plugins-core-4.3.0.tar.gz diff --git a/.gitignore b/.gitignore index a01eec8..ccc6400 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dnf-plugins-core-4.1.0.tar.gz +SOURCES/dnf-plugins-core-4.3.0.tar.gz diff --git a/SOURCES/0001-Move-system-upgrade-plugin-to-core-RhBug-2054235.patch b/SOURCES/0001-Move-system-upgrade-plugin-to-core-RhBug-2054235.patch new file mode 100644 index 0000000..d474231 --- /dev/null +++ b/SOURCES/0001-Move-system-upgrade-plugin-to-core-RhBug-2054235.patch @@ -0,0 +1,1711 @@ +From 75e92678bfb687d23594c3ecef299cddca657c3e Mon Sep 17 00:00:00 2001 +From: Jan Kolarik +Date: Thu, 22 Sep 2022 16:02:55 +0000 +Subject: [PATCH 1/4] Move system-upgrade plugin to core (RhBug:2054235) + += changelog = +type: bugfix +resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2054235 +--- + CMakeLists.txt | 15 + + dnf-plugins-core.spec | 38 +- + doc/CMakeLists.txt | 1 + + doc/conf.py | 1 + + doc/index.rst | 1 + + doc/system-upgrade.rst | 207 ++++++ + etc/CMakeLists.txt | 1 + + etc/systemd/CMakeLists.txt | 1 + + .../dnf-system-upgrade-cleanup.service | 11 + + etc/systemd/dnf-system-upgrade.service | 20 + + plugins/CMakeLists.txt | 1 + + plugins/system_upgrade.py | 699 ++++++++++++++++++ + tests/test_system_upgrade.py | 502 +++++++++++++ + 13 files changed, 1494 insertions(+), 4 deletions(-) + create mode 100644 doc/system-upgrade.rst + create mode 100644 etc/systemd/CMakeLists.txt + create mode 100644 etc/systemd/dnf-system-upgrade-cleanup.service + create mode 100644 etc/systemd/dnf-system-upgrade.service + create mode 100644 plugins/system_upgrade.py + create mode 100644 tests/test_system_upgrade.py + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 59c4f2a..a1eea7b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,6 +23,21 @@ MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") + + SET (SYSCONFDIR /etc) + ++find_package (PkgConfig) ++ ++if (PKG_CONFIG_FOUND) ++ pkg_search_module (SYSTEMD systemd) ++ if (SYSTEMD_FOUND) ++ execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd ++ OUTPUT_VARIABLE SYSTEMD_DIR ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ endif () ++endif() ++ ++if (NOT SYSTEMD_DIR) ++ set (SYSTEMD_DIR /usr/lib/systemd/system) ++endif () ++ + ADD_SUBDIRECTORY (libexec) + ADD_SUBDIRECTORY (doc) + ADD_SUBDIRECTORY (etc) +diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec +index c37dda8..4df6e44 100644 +--- a/dnf-plugins-core.spec ++++ b/dnf-plugins-core.spec +@@ -64,6 +64,9 @@ Provides: dnf-command(repograph) + Provides: dnf-command(repomanage) + Provides: dnf-command(reposync) + Provides: dnf-command(repodiff) ++Provides: dnf-command(system-upgrade) ++Provides: dnf-command(offline-upgrade) ++Provides: dnf-command(offline-distrosync) + Provides: dnf-plugins-extras-debug = %{version}-%{release} + Provides: dnf-plugins-extras-repoclosure = %{version}-%{release} + Provides: dnf-plugins-extras-repograph = %{version}-%{release} +@@ -80,6 +83,7 @@ Provides: dnf-plugin-repodiff = %{version}-%{release} + Provides: dnf-plugin-repograph = %{version}-%{release} + Provides: dnf-plugin-repomanage = %{version}-%{release} + Provides: dnf-plugin-reposync = %{version}-%{release} ++Provides: dnf-plugin-system-upgrade = %{version}-%{release} + %if %{with yumcompatibility} + Provides: yum-plugin-copr = %{version}-%{release} + Provides: yum-plugin-changelog = %{version}-%{release} +@@ -133,8 +137,8 @@ Conflicts: python-%{name} < %{version}-%{release} + %description -n python2-%{name} + Core Plugins for DNF, Python 2 interface. This package enhances DNF with builddep, + config-manager, copr, degug, debuginfo-install, download, needs-restarting, +-groups-manager, repoclosure, repograph, repomanage, reposync, changelog +-and repodiff commands. ++groups-manager, repoclosure, repograph, repomanage, reposync, changelog, ++repodiff, system-upgrade, offline-upgrade and offline-distrosync commands. + Additionally provides generate_completion_cache passive plugin. + %endif + +@@ -145,6 +149,10 @@ Summary: Core Plugins for DNF + BuildRequires: python3-dbus + BuildRequires: python3-devel + BuildRequires: python3-dnf >= %{dnf_lowest_compatible} ++BuildRequires: python3-systemd ++BuildRequires: pkgconfig(systemd) ++BuildRequires: systemd ++%{?systemd_ordering} + %if 0%{?fedora} + Requires: python3-distro + %endif +@@ -152,14 +160,17 @@ Requires: python3-dbus + Requires: python3-dnf >= %{dnf_lowest_compatible} + Requires: python3-hawkey >= %{hawkey_version} + Requires: python3-dateutil ++Requires: python3-systemd + Provides: python3-dnf-plugins-extras-debug = %{version}-%{release} + Provides: python3-dnf-plugins-extras-repoclosure = %{version}-%{release} + Provides: python3-dnf-plugins-extras-repograph = %{version}-%{release} + Provides: python3-dnf-plugins-extras-repomanage = %{version}-%{release} ++Provides: python3-dnf-plugin-system-upgrade = %{version}-%{release} + Obsoletes: python3-dnf-plugins-extras-debug < %{dnf_plugins_extra} + Obsoletes: python3-dnf-plugins-extras-repoclosure < %{dnf_plugins_extra} + Obsoletes: python3-dnf-plugins-extras-repograph < %{dnf_plugins_extra} + Obsoletes: python3-dnf-plugins-extras-repomanage < %{dnf_plugins_extra} ++Obsoletes: python3-dnf-plugin-system-upgrade < %{version}-%{release} + + Conflicts: %{name} <= 0.1.5 + # let the both python plugin versions be updated simultaneously +@@ -169,8 +180,8 @@ Conflicts: python-%{name} < %{version}-%{release} + %description -n python3-%{name} + Core Plugins for DNF, Python 3 interface. This package enhances DNF with builddep, + config-manager, copr, debug, debuginfo-install, download, needs-restarting, +-groups-manager, repoclosure, repograph, repomanage, reposync, changelog +-and repodiff commands. ++groups-manager, repoclosure, repograph, repomanage, reposync, changelog, ++repodiff, system-upgrade, offline-upgrade and offline-distrosync commands. + Additionally provides generate_completion_cache passive plugin. + %endif + +@@ -451,6 +462,17 @@ pushd build-py3 + %make_install + popd + %endif ++ ++%if %{with python3} ++mkdir -p %{buildroot}%{_unitdir}/system-update.target.wants/ ++pushd %{buildroot}%{_unitdir}/system-update.target.wants/ ++ ln -sr ../dnf-system-upgrade.service ++popd ++ ++ln -sf %{_mandir}/man8/dnf-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf-offline-upgrade.8.gz ++ln -sf %{_mandir}/man8/dnf-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf-offline-distrosync.8.gz ++%endif ++ + %find_lang %{name} + %if %{with yumutils} + %if %{with python3} +@@ -515,6 +537,9 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/ + %{_mandir}/man8/dnf-repograph.* + %{_mandir}/man8/dnf-repomanage.* + %{_mandir}/man8/dnf-reposync.* ++%{_mandir}/man8/dnf-system-upgrade.* ++%{_mandir}/man8/dnf-offline-upgrade.* ++%{_mandir}/man8/dnf-offline-distrosync.* + %if %{with yumcompatibility} + %{_mandir}/man1/yum-changelog.* + %{_mandir}/man8/yum-copr.* +@@ -572,6 +597,7 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/ + %{python3_sitelib}/dnf-plugins/repograph.py + %{python3_sitelib}/dnf-plugins/repomanage.py + %{python3_sitelib}/dnf-plugins/reposync.py ++%{python3_sitelib}/dnf-plugins/system_upgrade.py + %{python3_sitelib}/dnf-plugins/__pycache__/builddep.* + %{python3_sitelib}/dnf-plugins/__pycache__/changelog.* + %{python3_sitelib}/dnf-plugins/__pycache__/config_manager.* +@@ -587,7 +613,11 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/ + %{python3_sitelib}/dnf-plugins/__pycache__/repograph.* + %{python3_sitelib}/dnf-plugins/__pycache__/repomanage.* + %{python3_sitelib}/dnf-plugins/__pycache__/reposync.* ++%{python3_sitelib}/dnf-plugins/__pycache__/system_upgrade.* + %{python3_sitelib}/dnfpluginscore/ ++%{_unitdir}/dnf-system-upgrade.service ++%{_unitdir}/dnf-system-upgrade-cleanup.service ++%{_unitdir}/system-update.target.wants/dnf-system-upgrade.service + %endif + + %if %{with yumutils} +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index ff84cf8..79472a5 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -37,6 +37,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dnf-builddep.8 + ${CMAKE_CURRENT_BINARY_DIR}/dnf-reposync.8 + ${CMAKE_CURRENT_BINARY_DIR}/dnf-post-transaction-actions.8 + ${CMAKE_CURRENT_BINARY_DIR}/dnf-show-leaves.8 ++ ${CMAKE_CURRENT_BINARY_DIR}/dnf-system-upgrade.8 + ${CMAKE_CURRENT_BINARY_DIR}/dnf-versionlock.8 + ${CMAKE_CURRENT_BINARY_DIR}/yum-copr.8 + ${CMAKE_CURRENT_BINARY_DIR}/yum-versionlock.8 +diff --git a/doc/conf.py b/doc/conf.py +index 41d6936..327ac07 100644 +--- a/doc/conf.py ++++ b/doc/conf.py +@@ -264,6 +264,7 @@ man_pages = [ + ('post-transaction-actions', 'dnf-post-transaction-actions', + u'DNF post transaction actions Plugin', AUTHORS, 8), + ('show-leaves', 'dnf-show-leaves', u'DNF show-leaves Plugin', AUTHORS, 8), ++ ('system-upgrade', 'dnf-system-upgrade', u'DNF system-upgrade Plugin', AUTHORS, 8), + ('versionlock', 'dnf-versionlock', u'DNF versionlock Plugin', AUTHORS, 8), + + # yum3 compatible layer for manpages +diff --git a/doc/index.rst b/doc/index.rst +index 07f6052..251a24e 100644 +--- a/doc/index.rst ++++ b/doc/index.rst +@@ -46,6 +46,7 @@ This documents core plugins of DNF: + repomanage + reposync + show-leaves ++ system-upgrade + versionlock + + +diff --git a/doc/system-upgrade.rst b/doc/system-upgrade.rst +new file mode 100644 +index 0000000..3110460 +--- /dev/null ++++ b/doc/system-upgrade.rst +@@ -0,0 +1,207 @@ ++.. ++ Copyright (C) 2014-2016 Red Hat, Inc. ++ ++ This copyrighted material is made available to anyone wishing to use, ++ modify, copy, or redistribute it subject to the terms and conditions of ++ the GNU General Public License v.2, or (at your option) any later version. ++ This program is distributed in the hope that it will be useful, but WITHOUT ++ ANY WARRANTY expressed or implied, including the implied warranties of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General ++ Public License for more details. You should have received a copy of the ++ GNU General Public License along with this program; if not, write to the ++ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ 02110-1301, USA. Any Red Hat trademarks that are incorporated in the ++ source code or documentation are not subject to the GNU General Public ++ License and may only be used or replicated with the express permission of ++ Red Hat, Inc. ++ ++========================= ++DNF system-upgrade Plugin ++========================= ++ ++----------- ++Description ++----------- ++ ++DNF system-upgrades plugin provides three commands: ``system-upgrade``, ``offline-upgrade``, and ++``offline-distrosync``. Only ``system-upgrade`` command requires increase of distribution major ++version (``--releasever``) compared to installed version. ++ ++``dnf system-upgrade`` can be used to upgrade a Fedora system to a new major ++release. It replaces fedup (the old Fedora Upgrade tool). Before you proceed ensure that your system ++is fully upgraded (``dnf --refresh upgrade``). ++ ++The ``system-upgrade`` command also performes additional actions necessary for the upgrade of the ++system, for example an upgrade of groups and environments. ++ ++-------- ++Synopsis ++-------- ++ ++``dnf system-upgrade download --releasever VERSION [OPTIONS]`` ++ ++``dnf system-upgrade reboot`` ++ ++``dnf system-upgrade clean`` ++ ++``dnf system-upgrade log`` ++ ++``dnf system-upgrade log --number=`` ++ ++``dnf offline-upgrade download [OPTIONS]`` ++ ++``dnf offline-upgrade reboot`` ++ ++``dnf offline-upgrade clean`` ++ ++``dnf offline-upgrade log`` ++ ++``dnf offline-upgrade log --number=`` ++ ++``dnf offline-distrosync download [OPTIONS]`` ++ ++``dnf offline-distrosync reboot`` ++ ++``dnf offline-distrosync clean`` ++ ++``dnf offline-distrosync log`` ++ ++``dnf offline-distrosync log --number=`` ++ ++----------- ++Subcommands ++----------- ++ ++``download`` ++ Downloads everything needed to upgrade to a new major release. ++ ++``reboot`` ++ Prepares the system to perform the upgrade, and reboots to start the upgrade. ++ This can only be used after the ``download`` command completes successfully. ++ ++``clean`` ++ Remove previously-downloaded data. This happens automatically at the end of ++ a successful upgrade. ++ ++``log`` ++ Used to see a list of boots during which an upgrade was attempted, or show ++ the logs from an upgrade attempt. The logs for one of the boots can be shown ++ by specifying one of the numbers in the first column. Negative numbers can ++ be used to number the boots from last to first. For example, ``log --number=-1`` can ++ be used to see the logs for the last upgrade attempt. ++ ++------- ++Options ++------- ++ ++``--releasever=VERSION`` ++ REQUIRED. The version to upgrade to. Sets ``$releasever`` in all enabled ++ repos. Usually a number, or ``rawhide``. ++ ++``--downloaddir=`` ++ Redirect download of packages to provided ````. By default, packages ++ are downloaded into (per repository created) subdirectories of ++ /var/lib/dnf/system-upgrade. ++ ++``--distro-sync`` ++ Behave like ``dnf distro-sync``: always install packages from the new ++ release, even if they are older than the currently-installed version. This ++ is the default behavior. ++ ++``--no-downgrade`` ++ Behave like ``dnf update``: do not install packages from the new release ++ if they are older than what is currently installed. This is the opposite of ++ ``--distro-sync``. If both are specified, the last option will be used. The option cannot be ++ used with the ``offline-distrosync`` command. ++ ++``--number`` ++ Applied with ``log`` subcommand will show the log specified by the number. ++ ++----- ++Notes ++----- ++ ++``dnf system-upgrade reboot`` does not create a "System Upgrade" boot item. The ++upgrade will start regardless of which boot item is chosen. ++ ++The ``DNF_SYSTEM_UPGRADE_NO_REBOOT`` environment variable can be set to a ++non-empty value to disable the actual reboot performed by ``system-upgrade`` ++(e.g. for testing purposes). ++ ++Since this is a DNF plugin, options accepted by ``dnf`` are also valid here, ++such as ``--allowerasing``. ++See :manpage:`dnf(8)` for more information. ++ ++The ``fedup`` command is not provided, not even as an alias for ++``dnf system-upgrade``. ++ ++---- ++Bugs ++---- ++ ++Upgrading from install media (e.g. a DVD or .iso file) currently requires the ++user to manually set up a DNF repo and fstab entry for the media. ++ ++-------- ++Examples ++-------- ++ ++Typical upgrade usage ++--------------------- ++ ++``dnf --refresh upgrade`` ++ ++``dnf system-upgrade download --releasever 26`` ++ ++``dnf system-upgrade reboot`` ++ ++Show logs from last upgrade attempt ++----------------------------------- ++ ++``dnf system-upgrade log --number=-1`` ++ ++-------------- ++Reporting Bugs ++-------------- ++ ++Bugs should be filed here: ++ ++ https://bugzilla.redhat.com/ ++ ++For more info on filing bugs, see the Fedora Project wiki: ++ ++ https://fedoraproject.org/wiki/How_to_file_a_bug_report ++ ++ https://fedoraproject.org/wiki/Bugs_and_feature_requests ++ ++Please include ``/var/log/dnf.log`` and the output of ++``dnf system-upgrade log --number=-1`` (if applicable) in your bug reports. ++ ++Problems with dependency solving during download are best reported to the ++maintainers of the package(s) with the dependency problems. ++ ++Similarly, problems encountered on your system after the upgrade completes ++should be reported to the maintainers of the affected components. In other ++words: if (for example) KDE stops working, it's best if you report that to ++the KDE maintainers. ++ ++-------- ++See Also ++-------- ++ ++:manpage:`dnf(8)`, ++:manpage:`dnf.conf(5)`, ++:manpage:`journalctl(1)`. ++ ++Project homepage ++---------------- ++ ++https://github.com/rpm-software-management/dnf-plugins-core ++ ++------- ++Authors ++------- ++ ++Will Woods ++ ++Štěpán Smetana +diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt +index 2e9cccd..a892f8a 100644 +--- a/etc/CMakeLists.txt ++++ b/etc/CMakeLists.txt +@@ -1 +1,2 @@ + ADD_SUBDIRECTORY (dnf) ++ADD_SUBDIRECTORY (systemd) +diff --git a/etc/systemd/CMakeLists.txt b/etc/systemd/CMakeLists.txt +new file mode 100644 +index 0000000..8a29403 +--- /dev/null ++++ b/etc/systemd/CMakeLists.txt +@@ -0,0 +1 @@ ++INSTALL (FILES "dnf-system-upgrade.service" "dnf-system-upgrade-cleanup.service" DESTINATION ${SYSTEMD_DIR}) +diff --git a/etc/systemd/dnf-system-upgrade-cleanup.service b/etc/systemd/dnf-system-upgrade-cleanup.service +new file mode 100644 +index 0000000..49f771c +--- /dev/null ++++ b/etc/systemd/dnf-system-upgrade-cleanup.service +@@ -0,0 +1,11 @@ ++[Unit] ++Description=System Upgrade using DNF failed ++DefaultDependencies=no ++ ++[Service] ++Type=oneshot ++# Remove the symlink if it's still there, to protect against reboot loops. ++ExecStart=/usr/bin/rm -fv /system-update ++# If anything goes wrong, reboot back to the normal system. ++ExecStart=/usr/bin/systemctl --no-block reboot ++ +diff --git a/etc/systemd/dnf-system-upgrade.service b/etc/systemd/dnf-system-upgrade.service +new file mode 100644 +index 0000000..2d23cfe +--- /dev/null ++++ b/etc/systemd/dnf-system-upgrade.service +@@ -0,0 +1,20 @@ ++[Unit] ++Description=System Upgrade using DNF ++ConditionPathExists=/system-update ++Documentation=http://www.freedesktop.org/wiki/Software/systemd/SystemUpdates ++ ++DefaultDependencies=no ++Requires=sysinit.target ++After=sysinit.target systemd-journald.socket system-update-pre.target ++Before=shutdown.target system-update.target ++OnFailure=dnf-system-upgrade-cleanup.service ++ ++[Service] ++# We are done when the script exits, not before ++Type=oneshot ++# Upgrade output goes to journal and on-screen. ++StandardOutput=journal+console ++ExecStart=/usr/bin/dnf system-upgrade upgrade ++ ++[Install] ++WantedBy=system-update.target +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 59f148f..d004e5e 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -22,6 +22,7 @@ INSTALL (FILES repograph.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins) + INSTALL (FILES repomanage.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins) + INSTALL (FILES reposync.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins) + INSTALL (FILES show_leaves.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins) ++INSTALL (FILES system_upgrade.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins) + INSTALL (FILES modulesync.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins) + INSTALL (FILES versionlock.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins) + +diff --git a/plugins/system_upgrade.py b/plugins/system_upgrade.py +new file mode 100644 +index 0000000..fee6762 +--- /dev/null ++++ b/plugins/system_upgrade.py +@@ -0,0 +1,699 @@ ++# -*- coding: utf-8 -*- ++# ++# Copyright (c) 2015-2020 Red Hat, Inc. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License along ++# with this program. If not, see . ++# ++# Author(s): Will Woods ++ ++"""system_upgrade.py - DNF plugin to handle major-version system upgrades.""" ++ ++from subprocess import call, Popen, check_output, CalledProcessError ++import json ++import os ++import os.path ++import re ++import sys ++import uuid ++ ++from systemd import journal ++ ++from dnfpluginscore import _, logger ++ ++import dnf ++import dnf.cli ++from dnf.cli import CliError ++from dnf.i18n import ucd ++import dnf.transaction ++from dnf.transaction_sr import serialize_transaction, TransactionReplay ++ ++import libdnf.conf ++ ++ ++# Translators: This string is only used in unit tests. ++_("the color of the sky") ++ ++DOWNLOAD_FINISHED_ID = uuid.UUID('9348174c5cc74001a71ef26bd79d302e') ++REBOOT_REQUESTED_ID = uuid.UUID('fef1cc509d5047268b83a3a553f54b43') ++UPGRADE_STARTED_ID = uuid.UUID('3e0a5636d16b4ca4bbe5321d06c6aa62') ++UPGRADE_FINISHED_ID = uuid.UUID('8cec00a1566f4d3594f116450395f06c') ++ ++ID_TO_IDENTIFY_BOOTS = UPGRADE_STARTED_ID ++ ++PLYMOUTH = '/usr/bin/plymouth' ++ ++RELEASEVER_MSG = _( ++ "Need a --releasever greater than the current system version.") ++DOWNLOAD_FINISHED_MSG = _( # Translators: do not change "reboot" here ++ "Download complete! Use 'dnf {command} reboot' to start the upgrade.\n" ++ "To remove cached metadata and transaction use 'dnf {command} clean'") ++CANT_RESET_RELEASEVER = _( ++ "Sorry, you need to use 'download --releasever' instead of '--network'") ++ ++STATE_VERSION = 2 ++ ++# --- Miscellaneous helper functions ------------------------------------------ ++ ++ ++def reboot(): ++ if os.getenv("DNF_SYSTEM_UPGRADE_NO_REBOOT", default=False): ++ logger.info(_("Reboot turned off, not rebooting.")) ++ else: ++ Popen(["systemctl", "reboot"]) ++ ++ ++def get_url_from_os_release(): ++ key = "UPGRADE_GUIDE_URL=" ++ for path in ["/etc/os-release", "/usr/lib/os-release"]: ++ try: ++ with open(path) as release_file: ++ for line in release_file: ++ line = line.strip() ++ if line.startswith(key): ++ return line[len(key):].strip('"') ++ except IOError: ++ continue ++ return None ++ ++ ++# DNF-FIXME: dnf.util.clear_dir() doesn't delete regular files :/ ++def clear_dir(path, ignore=[]): ++ if not os.path.isdir(path): ++ return ++ ++ for entry in os.listdir(path): ++ fullpath = os.path.join(path, entry) ++ if fullpath in ignore: ++ continue ++ try: ++ if os.path.isdir(fullpath): ++ dnf.util.rm_rf(fullpath) ++ else: ++ os.unlink(fullpath) ++ except OSError: ++ pass ++ ++ ++def check_release_ver(conf, target=None): ++ if dnf.rpm.detect_releasever(conf.installroot) == conf.releasever: ++ raise CliError(RELEASEVER_MSG) ++ if target and target != conf.releasever: ++ # it's too late to set releasever here, so this can't work. ++ # (see https://bugzilla.redhat.com/show_bug.cgi?id=1212341) ++ raise CliError(CANT_RESET_RELEASEVER) ++ ++ ++def disable_blanking(): ++ try: ++ tty = open('/dev/tty0', 'wb') ++ tty.write(b'\33[9;0]') ++ except Exception as e: ++ print(_("Screen blanking can't be disabled: %s") % e) ++ ++# --- State object - for tracking upgrade state between runs ------------------ ++ ++ ++# DNF-INTEGRATION-NOTE: basically the same thing as dnf.persistor.JSONDB ++class State(object): ++ def __init__(self, statefile): ++ self.statefile = statefile ++ self._data = {} ++ self._read() ++ ++ def _read(self): ++ try: ++ with open(self.statefile) as fp: ++ self._data = json.load(fp) ++ except IOError: ++ self._data = {} ++ except ValueError: ++ self._data = {} ++ logger.warning(_("Failed loading state file: %s, continuing with " ++ "empty state."), self.statefile) ++ ++ def write(self): ++ dnf.util.ensure_dir(os.path.dirname(self.statefile)) ++ with open(self.statefile, 'w') as outf: ++ json.dump(self._data, outf, indent=4, sort_keys=True) ++ ++ def clear(self): ++ if os.path.exists(self.statefile): ++ os.unlink(self.statefile) ++ self._read() ++ ++ def __enter__(self): ++ return self ++ ++ def __exit__(self, exc_type, exc_value, traceback): ++ if exc_type is None: ++ self.write() ++ ++ # helper function for creating properties. pylint: disable=protected-access ++ def _prop(option): # pylint: disable=no-self-argument ++ def setprop(self, value): ++ self._data[option] = value ++ ++ def getprop(self): ++ return self._data.get(option) ++ return property(getprop, setprop) ++ ++ # !!! Increase STATE_VERSION for any changes in data structure like a new property or a new ++ # data structure !!! ++ state_version = _prop("state_version") ++ download_status = _prop("download_status") ++ destdir = _prop("destdir") ++ target_releasever = _prop("target_releasever") ++ system_releasever = _prop("system_releasever") ++ gpgcheck = _prop("gpgcheck") ++ # list of repos with gpgcheck=True ++ gpgcheck_repos = _prop("gpgcheck_repos") ++ # list of repos with repo_gpgcheck=True ++ repo_gpgcheck_repos = _prop("repo_gpgcheck_repos") ++ upgrade_status = _prop("upgrade_status") ++ upgrade_command = _prop("upgrade_command") ++ distro_sync = _prop("distro_sync") ++ enable_disable_repos = _prop("enable_disable_repos") ++ module_platform_id = _prop("module_platform_id") ++ ++# --- Plymouth output helpers ------------------------------------------------- ++ ++ ++class PlymouthOutput(object): ++ """A plymouth output helper class. ++ ++ Filters duplicate calls, and stops calling the plymouth binary if we ++ fail to contact it. ++ """ ++ ++ def __init__(self): ++ self.alive = True ++ self._last_args = dict() ++ self._last_msg = None ++ ++ def _plymouth(self, cmd, *args): ++ dupe_cmd = (args == self._last_args.get(cmd)) ++ if (self.alive and not dupe_cmd) or cmd == '--ping': ++ try: ++ self.alive = (call((PLYMOUTH, cmd) + args) == 0) ++ except OSError: ++ self.alive = False ++ self._last_args[cmd] = args ++ return self.alive ++ ++ def ping(self): ++ return self._plymouth("--ping") ++ ++ def message(self, msg): ++ if self._last_msg and self._last_msg != msg: ++ self._plymouth("hide-message", "--text", self._last_msg) ++ self._last_msg = msg ++ return self._plymouth("display-message", "--text", msg) ++ ++ def set_mode(self): ++ mode = 'updates' ++ try: ++ s = check_output([PLYMOUTH, '--help']) ++ if re.search('--system-upgrade', ucd(s)): ++ mode = 'system-upgrade' ++ except (CalledProcessError, OSError): ++ pass ++ return self._plymouth("change-mode", "--" + mode) ++ ++ def progress(self, percent): ++ return self._plymouth("system-update", "--progress", str(percent)) ++ ++ ++# A single PlymouthOutput instance for us to use within this module ++Plymouth = PlymouthOutput() ++ ++ ++# A TransactionProgress class that updates plymouth for us. ++class PlymouthTransactionProgress(dnf.callback.TransactionProgress): ++ ++ # pylint: disable=too-many-arguments ++ def progress(self, package, action, ti_done, ti_total, ts_done, ts_total): ++ self._update_plymouth(package, action, ts_done, ts_total) ++ ++ def _update_plymouth(self, package, action, current, total): ++ # Prevents quick jumps of progressbar when pretrans scriptlets ++ # and TRANS_PREPARATION are reported as 1/1 ++ if total == 1: ++ return ++ # Verification goes through all the packages again, ++ # which resets the "current" param value, this prevents ++ # resetting of the progress bar as well. (Rhbug:1809096) ++ if action != dnf.callback.PKG_VERIFY: ++ Plymouth.progress(int(90.0 * current / total)) ++ else: ++ Plymouth.progress(90 + int(10.0 * current / total)) ++ ++ Plymouth.message(self._fmt_event(package, action, current, total)) ++ ++ def _fmt_event(self, package, action, current, total): ++ action = dnf.transaction.ACTIONS.get(action, action) ++ return "[%d/%d] %s %s..." % (current, total, action, package) ++ ++# --- journal helpers ------------------------------------------------- ++ ++ ++def find_boots(message_id): ++ """Find all boots with this message id. ++ ++ Returns the entries of all found boots. ++ """ ++ j = journal.Reader() ++ j.add_match(MESSAGE_ID=message_id.hex, # identify the message ++ _UID=0) # prevent spoofing of logs ++ ++ oldboot = None ++ for entry in j: ++ boot = entry['_BOOT_ID'] ++ if boot == oldboot: ++ continue ++ oldboot = boot ++ yield entry ++ ++ ++def list_logs(): ++ print(_('The following boots appear to contain upgrade logs:')) ++ n = -1 ++ for n, entry in enumerate(find_boots(ID_TO_IDENTIFY_BOOTS)): ++ print('{} / {.hex}: {:%Y-%m-%d %H:%M:%S} {}→{}'.format( ++ n + 1, ++ entry['_BOOT_ID'], ++ entry['__REALTIME_TIMESTAMP'], ++ entry.get('SYSTEM_RELEASEVER', '??'), ++ entry.get('TARGET_RELEASEVER', '??'))) ++ if n == -1: ++ print(_('-- no logs were found --')) ++ ++ ++def pick_boot(message_id, n): ++ boots = list(find_boots(message_id)) ++ # Positive indices index all found boots starting with 1 and going forward, ++ # zero is the current boot, and -1, -2, -3 are previous going backwards. ++ # This is the same as journalctl. ++ try: ++ if n == 0: ++ raise IndexError ++ if n > 0: ++ n -= 1 ++ return boots[n]['_BOOT_ID'] ++ except IndexError: ++ raise CliError(_("Cannot find logs with this index.")) ++ ++ ++def show_log(n): ++ boot_id = pick_boot(ID_TO_IDENTIFY_BOOTS, n) ++ process = Popen(['journalctl', '--boot', boot_id.hex]) ++ process.wait() ++ rc = process.returncode ++ if rc == 1: ++ raise dnf.exceptions.Error(_("Unable to match systemd journal entry")) ++ ++ ++CMDS = ['download', 'clean', 'reboot', 'upgrade', 'log'] ++ ++# --- The actual Plugin and Command objects! ---------------------------------- ++ ++ ++class SystemUpgradePlugin(dnf.Plugin): ++ name = 'system-upgrade' ++ ++ def __init__(self, base, cli): ++ super(SystemUpgradePlugin, self).__init__(base, cli) ++ if cli: ++ cli.register_command(SystemUpgradeCommand) ++ cli.register_command(OfflineUpgradeCommand) ++ cli.register_command(OfflineDistrosyncCommand) ++ ++ ++class SystemUpgradeCommand(dnf.cli.Command): ++ aliases = ('system-upgrade', 'fedup',) ++ summary = _("Prepare system for upgrade to a new release") ++ ++ DATADIR = 'var/lib/dnf/system-upgrade' ++ ++ def __init__(self, cli): ++ super(SystemUpgradeCommand, self).__init__(cli) ++ self.datadir = os.path.join(cli.base.conf.installroot, self.DATADIR) ++ self.transaction_file = os.path.join(self.datadir, 'system-upgrade-transaction.json') ++ self.magic_symlink = os.path.join(cli.base.conf.installroot, 'system-update') ++ ++ self.state = State(os.path.join(self.datadir, 'system-upgrade-state.json')) ++ ++ @staticmethod ++ def set_argparser(parser): ++ parser.add_argument("--no-downgrade", dest='distro_sync', ++ action='store_false', ++ help=_("keep installed packages if the new " ++ "release's version is older")) ++ parser.add_argument('tid', nargs=1, choices=CMDS, ++ metavar="[%s]" % "|".join(CMDS)) ++ parser.add_argument('--number', type=int, help=_('which logs to show')) ++ ++ def log_status(self, message, message_id): ++ """Log directly to the journal.""" ++ journal.send(message, ++ MESSAGE_ID=message_id, ++ PRIORITY=journal.LOG_NOTICE, ++ SYSTEM_RELEASEVER=self.state.system_releasever, ++ TARGET_RELEASEVER=self.state.target_releasever, ++ DNF_VERSION=dnf.const.VERSION) ++ ++ def pre_configure(self): ++ self._call_sub("check") ++ self._call_sub("pre_configure") ++ ++ def configure(self): ++ self._call_sub("configure") ++ ++ def run(self): ++ self._call_sub("run") ++ ++ def run_transaction(self): ++ self._call_sub("transaction") ++ ++ def run_resolved(self): ++ self._call_sub("resolved") ++ ++ def _call_sub(self, name): ++ subfunc = getattr(self, name + '_' + self.opts.tid[0], None) ++ if callable(subfunc): ++ subfunc() ++ ++ def _check_state_version(self, command): ++ if self.state.state_version != STATE_VERSION: ++ msg = _("Incompatible version of data. Rerun 'dnf {command} download [OPTIONS]'" ++ "").format(command=command) ++ raise CliError(msg) ++ ++ def _set_cachedir(self): ++ # set download directories from json state file ++ self.base.conf.cachedir = self.datadir ++ self.base.conf.destdir = self.state.destdir if self.state.destdir else None ++ ++ def _get_forward_reverse_pkg_reason_pairs(self): ++ """ ++ forward = {repoid:{pkg_nevra: {tsi.action: tsi.reason}} ++ reverse = {pkg_nevra: {tsi.action: tsi.reason}} ++ :return: forward, reverse ++ """ ++ backward_action = set(dnf.transaction.BACKWARD_ACTIONS + [libdnf.transaction.TransactionItemAction_REINSTALLED]) ++ forward_actions = set(dnf.transaction.FORWARD_ACTIONS) ++ ++ forward = {} ++ reverse = {} ++ for tsi in self.cli.base.transaction: ++ if tsi.action in forward_actions: ++ pkg = tsi.pkg ++ forward.setdefault(pkg.repo.id, {}).setdefault( ++ str(pkg), {})[tsi.action] = tsi.reason ++ elif tsi.action in backward_action: ++ reverse.setdefault(str(tsi.pkg), {})[tsi.action] = tsi.reason ++ return forward, reverse ++ ++ # == pre_configure_*: set up action-specific demands ========================== ++ def pre_configure_download(self): ++ # only download subcommand accepts --destdir command line option ++ self.base.conf.cachedir = self.datadir ++ self.base.conf.destdir = self.opts.destdir if self.opts.destdir else None ++ if 'offline-distrosync' == self.opts.command and not self.opts.distro_sync: ++ raise CliError( ++ _("Command 'offline-distrosync' cannot be used with --no-downgrade option")) ++ elif 'offline-upgrade' == self.opts.command: ++ self.opts.distro_sync = False ++ ++ def pre_configure_reboot(self): ++ self._set_cachedir() ++ ++ def pre_configure_upgrade(self): ++ self._set_cachedir() ++ if self.state.enable_disable_repos: ++ self.opts.repos_ed = self.state.enable_disable_repos ++ self.base.conf.releasever = self.state.target_releasever ++ ++ def pre_configure_clean(self): ++ self._set_cachedir() ++ ++ # == configure_*: set up action-specific demands ========================== ++ ++ def configure_download(self): ++ if 'system-upgrade' == self.opts.command or 'fedup' == self.opts.command: ++ help_url = get_url_from_os_release() ++ if help_url: ++ msg = _('Additional information for System Upgrade: {}') ++ logger.info(msg.format(ucd(help_url))) ++ if self.base._promptWanted(): ++ msg = _('Before you continue ensure that your system is fully upgraded by running ' ++ '"dnf --refresh upgrade". Do you want to continue') ++ if self.base.conf.assumeno or not self.base.output.userconfirm( ++ msg='{} [y/N]: '.format(msg), defaultyes_msg='{} [Y/n]: '.format(msg)): ++ logger.error(_("Operation aborted.")) ++ sys.exit(1) ++ check_release_ver(self.base.conf, target=self.opts.releasever) ++ self.cli.demands.root_user = True ++ self.cli.demands.resolving = True ++ self.cli.demands.available_repos = True ++ self.cli.demands.sack_activation = True ++ self.cli.demands.freshest_metadata = True ++ # We want to do the depsolve / download / transaction-test, but *not* ++ # run the actual RPM transaction to install the downloaded packages. ++ # Setting the "test" flag makes the RPM transaction a test transaction, ++ # so nothing actually gets installed. ++ # (It also means that we run two test transactions in a row, which is ++ # kind of silly, but that's something for DNF to fix...) ++ self.base.conf.tsflags += ["test"] ++ ++ def configure_reboot(self): ++ # FUTURE: add a --debug-shell option to enable debug shell: ++ # systemctl add-wants system-update.target debug-shell.service ++ self.cli.demands.root_user = True ++ ++ def configure_upgrade(self): ++ # same as the download, but offline and non-interactive. so... ++ self.cli.demands.root_user = True ++ self.cli.demands.resolving = True ++ self.cli.demands.available_repos = True ++ self.cli.demands.sack_activation = True ++ # use the saved value for --allowerasing, etc. ++ self.opts.distro_sync = self.state.distro_sync ++ if self.state.gpgcheck is not None: ++ self.base.conf.gpgcheck = self.state.gpgcheck ++ if self.state.gpgcheck_repos is not None: ++ for repo in self.base.repos.values(): ++ repo.gpgcheck = repo.id in self.state.gpgcheck_repos ++ if self.state.repo_gpgcheck_repos is not None: ++ for repo in self.base.repos.values(): ++ repo.repo_gpgcheck = repo.id in self.state.repo_gpgcheck_repos ++ self.base.conf.module_platform_id = self.state.module_platform_id ++ # don't try to get new metadata, 'cuz we're offline ++ self.cli.demands.cacheonly = True ++ # and don't ask any questions (we confirmed all this beforehand) ++ self.base.conf.assumeyes = True ++ self.cli.demands.transaction_display = PlymouthTransactionProgress() ++ # upgrade operation already removes all element that must be removed. Additional removal ++ # could trigger unwanted changes in transaction. ++ self.base.conf.clean_requirements_on_remove = False ++ self.base.conf.install_weak_deps = False ++ ++ def configure_clean(self): ++ self.cli.demands.root_user = True ++ ++ def configure_log(self): ++ pass ++ ++ # == check_*: do any action-specific checks =============================== ++ ++ def check_reboot(self): ++ if not self.state.download_status == 'complete': ++ raise CliError(_("system is not ready for upgrade")) ++ self._check_state_version(self.opts.command) ++ if self.state.upgrade_command != self.opts.command: ++ msg = _("the transaction was not prepared for '{command}'. " ++ "Rerun 'dnf {command} download [OPTIONS]'").format(command=self.opts.command) ++ raise CliError(msg) ++ if os.path.lexists(self.magic_symlink): ++ raise CliError(_("upgrade is already scheduled")) ++ dnf.util.ensure_dir(self.datadir) ++ # FUTURE: checkRPMDBStatus(self.state.download_transaction_id) ++ ++ def check_upgrade(self): ++ if not os.path.lexists(self.magic_symlink): ++ logger.info(_("trigger file does not exist. exiting quietly.")) ++ raise SystemExit(0) ++ if os.readlink(self.magic_symlink) != self.datadir: ++ logger.info(_("another upgrade tool is running. exiting quietly.")) ++ raise SystemExit(0) ++ # Delete symlink ASAP to avoid reboot loops ++ dnf.yum.misc.unlink_f(self.magic_symlink) ++ command = self.state.upgrade_command ++ if not command: ++ command = self.opts.command ++ self._check_state_version(command) ++ if not self.state.upgrade_status == 'ready': ++ msg = _("use 'dnf {command} reboot' to begin the upgrade").format(command=command) ++ raise CliError(msg) ++ ++ # == run_*: run the action/prep the transaction =========================== ++ ++ def run_prepare(self): ++ # make the magic symlink ++ os.symlink(self.datadir, self.magic_symlink) ++ # set upgrade_status so that the upgrade can run ++ with self.state as state: ++ state.upgrade_status = 'ready' ++ ++ def run_reboot(self): ++ self.run_prepare() ++ ++ if not self.opts.tid[0] == "reboot": ++ return ++ ++ self.log_status(_("Rebooting to perform upgrade."), ++ REBOOT_REQUESTED_ID) ++ reboot() ++ ++ def run_download(self): ++ # Mark everything in the world for upgrade/sync ++ if self.opts.distro_sync: ++ self.base.distro_sync() ++ else: ++ self.base.upgrade_all() ++ ++ if self.opts.command not in ['offline-upgrade', 'offline-distrosync']: ++ # Mark all installed groups and environments for upgrade ++ self.base.read_comps() ++ installed_groups = [g.id for g in self.base.comps.groups if self.base.history.group.get(g.id)] ++ if installed_groups: ++ self.base.env_group_upgrade(installed_groups) ++ installed_environments = [g.id for g in self.base.comps.environments if self.base.history.env.get(g.id)] ++ if installed_environments: ++ self.base.env_group_upgrade(installed_environments) ++ ++ with self.state as state: ++ state.download_status = 'downloading' ++ state.target_releasever = self.base.conf.releasever ++ state.destdir = self.base.conf.destdir ++ ++ def run_upgrade(self): ++ # change the upgrade status (so we can detect crashed upgrades later) ++ command = '' ++ with self.state as state: ++ state.upgrade_status = 'incomplete' ++ command = state.upgrade_command ++ if command == 'offline-upgrade': ++ msg = _("Starting offline upgrade. This will take a while.") ++ elif command == 'offline-distrosync': ++ msg = _("Starting offline distrosync. This will take a while.") ++ else: ++ msg = _("Starting system upgrade. This will take a while.") ++ ++ self.log_status(msg, UPGRADE_STARTED_ID) ++ ++ # reset the splash mode and let the user know we're running ++ Plymouth.set_mode() ++ Plymouth.progress(0) ++ Plymouth.message(msg) ++ ++ # disable screen blanking ++ disable_blanking() ++ ++ self.replay = TransactionReplay(self.base, self.transaction_file) ++ self.replay.run() ++ ++ def run_clean(self): ++ logger.info(_("Cleaning up downloaded data...")) ++ # Don't delete persistor, it contains paths for downloaded packages ++ # that are used by dnf during finalizing base to clean them up ++ clear_dir(self.base.conf.cachedir, ++ [dnf.persistor.TempfilePersistor(self.base.conf.cachedir).db_path]) ++ with self.state as state: ++ state.download_status = None ++ state.state_version = None ++ state.upgrade_status = None ++ state.upgrade_command = None ++ state.destdir = None ++ ++ def run_log(self): ++ if self.opts.number: ++ show_log(self.opts.number) ++ else: ++ list_logs() ++ ++ # == resolved_*: do staff after succesful resolvement ===================== ++ ++ def resolved_upgrade(self): ++ """Adjust transaction reasons according to stored values""" ++ self.replay.post_transaction() ++ ++ # == transaction_*: do stuff after a successful transaction =============== ++ ++ def transaction_download(self): ++ transaction = self.base.history.get_current() ++ ++ if not transaction.packages(): ++ logger.info(_("The system-upgrade transaction is empty, your system is already up-to-date.")) ++ return ++ ++ data = serialize_transaction(transaction) ++ try: ++ with open(self.transaction_file, "w") as f: ++ json.dump(data, f, indent=4, sort_keys=True) ++ f.write("\n") ++ ++ print(_("Transaction saved to {}.").format(self.transaction_file)) ++ ++ except OSError as e: ++ raise dnf.cli.CliError(_('Error storing transaction: {}').format(str(e))) ++ ++ # Okay! Write out the state so the upgrade can use it. ++ system_ver = dnf.rpm.detect_releasever(self.base.conf.installroot) ++ with self.state as state: ++ state.download_status = 'complete' ++ state.state_version = STATE_VERSION ++ state.distro_sync = self.opts.distro_sync ++ state.gpgcheck = self.base.conf.gpgcheck ++ state.gpgcheck_repos = [ ++ repo.id for repo in self.base.repos.values() if repo.gpgcheck] ++ state.repo_gpgcheck_repos = [ ++ repo.id for repo in self.base.repos.values() if repo.repo_gpgcheck] ++ state.system_releasever = system_ver ++ state.target_releasever = self.base.conf.releasever ++ state.module_platform_id = self.base.conf.module_platform_id ++ state.enable_disable_repos = self.opts.repos_ed ++ state.destdir = self.base.conf.destdir ++ state.upgrade_command = self.opts.command ++ ++ msg = DOWNLOAD_FINISHED_MSG.format(command=self.opts.command) ++ logger.info(msg) ++ self.log_status(_("Download finished."), DOWNLOAD_FINISHED_ID) ++ ++ def transaction_upgrade(self): ++ Plymouth.message(_("Upgrade complete! Cleaning up and rebooting...")) ++ self.log_status(_("Upgrade complete! Cleaning up and rebooting..."), ++ UPGRADE_FINISHED_ID) ++ self.run_clean() ++ if self.opts.tid[0] == "upgrade": ++ reboot() ++ ++ ++class OfflineUpgradeCommand(SystemUpgradeCommand): ++ aliases = ('offline-upgrade',) ++ summary = _("Prepare offline upgrade of the system") ++ ++ ++class OfflineDistrosyncCommand(SystemUpgradeCommand): ++ aliases = ('offline-distrosync',) ++ summary = _("Prepare offline distrosync of the system") +diff --git a/tests/test_system_upgrade.py b/tests/test_system_upgrade.py +new file mode 100644 +index 0000000..6ef4c21 +--- /dev/null ++++ b/tests/test_system_upgrade.py +@@ -0,0 +1,502 @@ ++# test_system_upgrade.py - unit tests for system-upgrade plugin ++ ++import system_upgrade ++ ++from system_upgrade import PLYMOUTH, CliError ++ ++import os ++import tempfile ++import shutil ++import gettext ++ ++from dnf.callback import (PKG_CLEANUP, PKG_DOWNGRADE, PKG_INSTALL, ++ PKG_OBSOLETE, PKG_REINSTALL, PKG_REMOVE, PKG_UPGRADE, ++ PKG_VERIFY, TRANS_POST) ++ ++import unittest ++ ++from tests.support import mock ++patch = mock.patch ++ ++ ++@patch('system_upgrade.call', return_value=0) ++class PlymouthTestCase(unittest.TestCase): ++ def setUp(self): ++ self.ply = system_upgrade.PlymouthOutput() ++ self.msg = "Hello, plymouth." ++ self.msg_args = (PLYMOUTH, "display-message", "--text", self.msg) ++ ++ def test_ping(self, call): ++ self.ply.ping() ++ call.assert_called_once_with((PLYMOUTH, "--ping")) ++ self.assertTrue(self.ply.alive) ++ ++ def test_ping_when_dead(self, call): ++ call.return_value = 1 ++ self.ply.ping() ++ self.assertFalse(self.ply.alive) ++ call.return_value = 0 ++ self.ply.ping() ++ self.assertEqual(call.call_count, 2) ++ self.assertTrue(self.ply.alive) ++ ++ def test_message(self, call): ++ self.ply.message(self.msg) ++ call.assert_called_once_with(self.msg_args) ++ ++ def test_hide_message(self, call): ++ messages = ("first", "middle", "BONUS", "last") ++ for m in messages: ++ self.ply.message(m) ++ ++ def hidem(m): ++ return mock.call((PLYMOUTH, "hide-message", "--text", m)) ++ ++ def dispm(m): ++ return mock.call((PLYMOUTH, "display-message", "--text", m)) ++ m1, m2, m3, m4 = messages ++ call.assert_has_calls([ ++ dispm(m1), ++ hidem(m1), dispm(m2), ++ hidem(m2), dispm(m3), ++ hidem(m3), dispm(m4), ++ ]) ++ ++ def test_message_dupe(self, call): ++ self.ply.message(self.msg) ++ self.ply.message(self.msg) ++ call.assert_called_once_with(self.msg_args) ++ ++ def test_message_dead(self, call): ++ call.return_value = 1 ++ self.ply.message(self.msg) ++ self.assertFalse(self.ply.alive) ++ self.ply.message("not even gonna bother") ++ call.assert_called_once_with(self.msg_args) ++ ++ def test_progress(self, call): ++ self.ply.progress(27) ++ call.assert_called_once_with( ++ (PLYMOUTH, "system-update", "--progress", str(27))) ++ ++ @patch('system_upgrade.check_output', ++ return_value="this plymouth does support --system-upgrade mode") ++ def test_mode(self, check_output, call): ++ self.ply.set_mode() ++ call.assert_called_once_with((PLYMOUTH, "change-mode", "--system-upgrade")) ++ ++ @patch('system_upgrade.check_output', ++ return_value="this plymouth doesn't support system-upgrade mode") ++ def test_mode_no_system_upgrade_plymouth(self, check_output, call): ++ self.ply.set_mode() ++ call.assert_called_once_with((PLYMOUTH, "change-mode", "--updates")) ++ ++ def test_mode_no_plymouth(self, call): ++ call.side_effect = OSError(2, 'No such file or directory') ++ self.ply.set_mode() ++ self.assertFalse(self.ply.alive) ++ ++ ++@patch('system_upgrade.call', return_value=0) ++class PlymouthTransactionProgressTestCase(unittest.TestCase): ++ actions = (PKG_CLEANUP, PKG_DOWNGRADE, PKG_INSTALL, PKG_OBSOLETE, ++ PKG_REINSTALL, PKG_REMOVE, PKG_UPGRADE, PKG_VERIFY, ++ TRANS_POST) ++ ++ # pylint: disable=protected-access ++ def setUp(self): ++ system_upgrade.Plymouth = system_upgrade.PlymouthOutput() ++ self.display = system_upgrade.PlymouthTransactionProgress() ++ self.pkg = "testpackage" ++ ++ def test_display(self, call): ++ for action in self.actions: ++ self.display.progress(self.pkg, action, 0, 100, 1, 1000) ++ msg = self.display._fmt_event(self.pkg, action, 1, 1000) ++ # updating plymouth display means two plymouth calls ++ call.assert_has_calls([ ++ mock.call((PLYMOUTH, "system-update", "--progress", "0")), ++ mock.call((PLYMOUTH, "display-message", "--text", msg)) ++ ], any_order=True) ++ ++ def test_filter_calls(self, call): ++ action = PKG_INSTALL ++ # first display update -> set percentage and text ++ self.display.progress(self.pkg, action, 0, 100, 1, 1000) ++ msg1 = self.display._fmt_event(self.pkg, action, 1, 1000) ++ call.assert_has_calls([ ++ mock.call((PLYMOUTH, "system-update", "--progress", "0")), ++ mock.call((PLYMOUTH, "display-message", "--text", msg1)), ++ ]) ++ ++ # event progress on the same transaction item. ++ # no new calls to plymouth because the percentage and text don't change ++ for te_cur in range(1, 100): ++ self.display.progress(self.pkg, action, te_cur, 100, 1, 1000) ++ call.assert_has_calls([ ++ mock.call((PLYMOUTH, "system-update", "--progress", "0")), ++ mock.call((PLYMOUTH, "display-message", "--text", msg1)), ++ ]) ++ ++ # new item: new message ("[2/1000] ..."), but percentage still 0.. ++ self.display.progress(self.pkg, action, 0, 100, 2, 1000) ++ # old message hidden, new message displayed. no new percentage. ++ msg2 = self.display._fmt_event(self.pkg, action, 2, 1000) ++ call.assert_has_calls([ ++ mock.call((PLYMOUTH, "system-update", "--progress", "0")), ++ mock.call((PLYMOUTH, "display-message", "--text", msg1)), ++ mock.call((PLYMOUTH, "hide-message", "--text", msg1)), ++ mock.call((PLYMOUTH, "display-message", "--text", msg2)), ++ ]) ++ ++ ++TESTLANG = "zh_CN" ++TESTLANG_MO = "po/%s.mo" % TESTLANG ++ ++ ++@unittest.skipUnless(os.path.exists(TESTLANG_MO), "make %s first" % ++ TESTLANG_MO) ++# @unittest.skip("There is no translation yet to system-upgrade") ++class I18NTestCaseBase(unittest.TestCase): ++ @classmethod ++ @unittest.skip("There is no translation yet to system-upgrade") ++ def setUpClass(cls): ++ cls.localedir = tempfile.mkdtemp(prefix='system_upgrade_test_i18n-') ++ cls.msgdir = os.path.join(cls.localedir, TESTLANG + "/LC_MESSAGES") ++ cls.msgfile = "dnf-plugins-extras" + ".mo" ++ os.makedirs(cls.msgdir) ++ shutil.copy2(TESTLANG_MO, os.path.join(cls.msgdir, cls.msgfile)) ++ ++ @classmethod ++ def tearDownClass(cls): ++ shutil.rmtree(cls.localedir) ++ ++ def setUp(self): ++ self.t = gettext.translation("dnf-plugins-extras", self.localedir, ++ languages=[TESTLANG], fallback=True) ++ self.gettext = self.t.gettext ++ ++ ++class I18NTestCase(I18NTestCaseBase): ++ @unittest.skip("There is no translation yet to system-upgrade") ++ def test_selftest(self): ++ self.assertIn(self.msgfile, os.listdir(self.msgdir)) ++ self.assertIn(TESTLANG, os.listdir(self.localedir)) ++ t = gettext.translation("dnf-plugins-extras", self.localedir, ++ languages=[TESTLANG], fallback=False) ++ info = t.info() ++ self.assertIn("language", info) ++ self.assertEqual(info["language"], TESTLANG.replace("_", "-")) ++ ++ @unittest.skip("There is no translation yet to system-upgrade") ++ def test_fallback(self): ++ msg = "THIS STRING DOES NOT EXIST" ++ trans_msg = self.gettext(msg) ++ self.assertEqual(msg, trans_msg) ++ ++ @unittest.skip("There is no translation yet to system-upgrade") ++ def test_translation(self): ++ msg = "the color of the sky" ++ trans_msg = self.gettext(msg) ++ self.assertNotEqual(msg, trans_msg) ++ ++ ++class StateTestCase(unittest.TestCase): ++ @classmethod ++ def setUpClass(cls): ++ cls.statedir = tempfile.mkdtemp(prefix="system_upgrade_test_state-") ++ cls.StateClass = system_upgrade.State ++ ++ def setUp(self): ++ self.state = self.StateClass(os.path.join(self.statedir, "state")) ++ ++ def test_bool_value(self): ++ with self.state: ++ self.state.distro_sync = True ++ del self.state ++ self.state = self.StateClass(os.path.join(self.statedir, "state")) ++ self.assertIs(self.state.distro_sync, True) ++ ++ @classmethod ++ def tearDownClass(cls): ++ shutil.rmtree(cls.statedir) ++ ++ ++class UtilTestCase(unittest.TestCase): ++ def setUp(self): ++ self.tmpdir = tempfile.mkdtemp(prefix='system_upgrade_test_util-') ++ self.dirs = ["dir1", "dir2"] ++ self.files = ["file1", "dir2/file2"] ++ for d in self.dirs: ++ os.makedirs(os.path.join(self.tmpdir, d)) ++ for f in self.files: ++ with open(os.path.join(self.tmpdir, f), 'wt') as fobj: ++ fobj.write("hi there\n") ++ ++ def test_self_test(self): ++ for d in self.dirs: ++ self.assertTrue(os.path.isdir(os.path.join(self.tmpdir, d))) ++ for f in self.files: ++ self.assertTrue(os.path.exists(os.path.join(self.tmpdir, f))) ++ ++ def test_clear_dir(self): ++ self.assertTrue(os.path.isdir(self.tmpdir)) ++ system_upgrade.clear_dir(self.tmpdir) ++ self.assertTrue(os.path.isdir(self.tmpdir)) ++ self.assertEqual(os.listdir(self.tmpdir), []) ++ ++ def tearDown(self): ++ shutil.rmtree(self.tmpdir) ++ ++ ++class CommandTestCaseBase(unittest.TestCase): ++ def setUp(self): ++ self.datadir = tempfile.mkdtemp(prefix="system_upgrade_test_datadir-") ++ self.installroot = tempfile.TemporaryDirectory(prefix="system_upgrade_test_installroot-") ++ system_upgrade.SystemUpgradeCommand.DATADIR = self.datadir ++ self.cli = mock.MagicMock() ++ # the installroot is not strictly necessary for the test, but ++ # releasever detection is accessing host system files without it, and ++ # this fails on permissions in COPR srpm builds (e.g. from rpm-gitoverlay) ++ self.cli.base.conf.installroot = self.installroot.name ++ self.command = system_upgrade.SystemUpgradeCommand(cli=self.cli) ++ self.command.base.conf.cachedir = os.path.join(self.datadir, "cache") ++ self.command.base.conf.destdir = None ++ ++ def tearDown(self): ++ shutil.rmtree(self.datadir) ++ self.installroot.cleanup() ++ ++ ++class CommandTestCase(CommandTestCaseBase): ++ # self-tests for the command test cases ++ def test_state(self): ++ # initial state: no status ++ self.assertIsNone(self.command.state.download_status) ++ self.assertIsNone(self.command.state.upgrade_status) ++ ++ ++class CleanCommandTestCase(CommandTestCaseBase): ++ def test_pre_configure_clean(self): ++ with self.command.state as state: ++ state.destdir = "/grape/wine" ++ self.command.pre_configure_clean() ++ self.assertEqual(self.command.base.conf.destdir, "/grape/wine") ++ ++ def test_configure_clean(self): ++ self.cli.demands.root_user = None ++ self.command.configure_clean() ++ self.assertTrue(self.cli.demands.root_user) ++ ++ def test_run_clean(self): ++ with self.command.state as state: ++ state.download_status = "complete" ++ state.upgrade_status = "ready" ++ # make sure the datadir and state info is set up OK ++ self.assertEqual(self.command.state.download_status, "complete") ++ self.assertEqual(self.command.state.upgrade_status, "ready") ++ # run cleanup ++ self.command.run_clean() ++ # state is cleared ++ self.assertIsNone(self.command.state.download_status) ++ self.assertIsNone(self.command.state.upgrade_status) ++ ++ ++class RebootCheckCommandTestCase(CommandTestCaseBase): ++ def setUp(self): ++ super(RebootCheckCommandTestCase, self).setUp() ++ self.magic_symlink = self.datadir + '/symlink' ++ self.command.magic_symlink = self.magic_symlink ++ ++ def test_pre_configure_reboot(self): ++ with self.command.state as state: ++ state.destdir = "/grape/wine" ++ self.command.pre_configure_reboot() ++ self.assertEqual(self.command.base.conf.destdir, "/grape/wine") ++ ++ def test_configure_reboot(self): ++ self.cli.demands.root_user = None ++ self.command.configure_reboot() ++ self.assertTrue(self.cli.demands.root_user) ++ ++ def check_reboot(self, status='complete', lexists=False, command='system-upgrade', ++ state_command='system-upgrade'): ++ with patch('system_upgrade.os.path.lexists') as lexists_func: ++ self.command.state.state_version = 2 ++ self.command.state.download_status = status ++ self.command.opts = mock.MagicMock() ++ self.command.opts.command = command ++ self.command.state.upgrade_command = state_command ++ lexists_func.return_value = lexists ++ self.command.check_reboot() ++ ++ def test_check_reboot_ok(self): ++ self.check_reboot(status='complete', lexists=False) ++ ++ def test_check_reboot_different_command(self): ++ with self.assertRaises(CliError): ++ self.check_reboot(status='complete', lexists=False, command='system-upgrade', ++ state_command='offline-upgrade') ++ ++ def test_check_reboot_no_download(self): ++ with self.assertRaises(CliError): ++ self.check_reboot(status=None, lexists=False) ++ ++ def test_check_reboot_link_exists(self): ++ with self.assertRaises(CliError): ++ self.check_reboot(status='complete', lexists=True) ++ ++ def test_run_prepare(self): ++ self.command.run_prepare() ++ self.assertEqual(os.readlink(self.magic_symlink), self.datadir) ++ self.assertEqual(self.command.state.upgrade_status, 'ready') ++ ++ @patch('system_upgrade.SystemUpgradeCommand.run_prepare') ++ @patch('system_upgrade.SystemUpgradeCommand.log_status') ++ @patch('system_upgrade.reboot') ++ def test_run_reboot(self, reboot, log_status, run_prepare): ++ self.command.opts = mock.MagicMock() ++ self.command.opts.tid = ["reboot"] ++ self.command.run_reboot() ++ run_prepare.assert_called_once_with() ++ self.assertEqual(system_upgrade.REBOOT_REQUESTED_ID, ++ log_status.call_args[0][1]) ++ self.assertTrue(reboot.called) ++ ++ @patch('system_upgrade.SystemUpgradeCommand.run_prepare') ++ @patch('system_upgrade.SystemUpgradeCommand.log_status') ++ @patch('system_upgrade.reboot') ++ def test_reboot_prepare_only(self, reboot, log_status, run_prepare): ++ self.command.opts = mock.MagicMock() ++ self.command.opts.tid = [None] ++ self.command.run_reboot() ++ run_prepare.assert_called_once_with() ++ self.assertFalse(log_status.called) ++ self.assertFalse(reboot.called) ++ ++ ++class DownloadCommandTestCase(CommandTestCase): ++ def test_pre_configure_download_default(self): ++ self.command.opts = mock.MagicMock() ++ self.command.opts.destdir = None ++ self.command.base.conf.destdir = None ++ self.command.pre_configure_download() ++ self.assertEqual(self.command.base.conf.cachedir, self.datadir) ++ ++ def test_pre_configure_download_destdir(self): ++ self.command.opts = mock.MagicMock() ++ self.command.opts.destdir = self.datadir ++ self.command.pre_configure_download() ++ self.assertEqual(self.command.base.conf.destdir, self.datadir) ++ ++ def test_configure_download(self): ++ self.command.opts = mock.MagicMock() ++ self.command.opts.tid = "download" ++ self.command.configure() ++ self.assertTrue(self.cli.demands.root_user) ++ self.assertTrue(self.cli.demands.resolving) ++ self.assertTrue(self.cli.demands.sack_activation) ++ self.assertTrue(self.cli.demands.available_repos) ++ ++ def test_transaction_download(self): ++ pkg = mock.MagicMock() ++ repo = mock.MagicMock() ++ repo.id = 'test' ++ pkg.name = "kernel" ++ pkg.repo = repo ++ self.cli.base.transaction.install_set = [pkg] ++ self.command.opts = mock.MagicMock() ++ self.command.opts.distro_sync = True ++ self.command.opts.command = "system_upgrade" ++ self.command.opts.repos_ed = [] ++ self.cli.demands.allow_erasing = "allow_erasing" ++ self.command.base.conf.best = True ++ self.command.base.conf.releasever = "35" ++ self.command.base.conf.gpgcheck = True ++ self.command.opts.destdir = self.datadir ++ self.command.base.conf.install_weak_deps = True ++ self.command.base.conf.module_platform_id = '' ++ self.command.pre_configure_download() ++ self.command.transaction_download() ++ with system_upgrade.State(self.command.state.statefile) as state: ++ self.assertEqual(state.state_version, system_upgrade.STATE_VERSION) ++ self.assertEqual(state.download_status, "complete") ++ self.assertEqual(state.distro_sync, True) ++ self.assertEqual(state.destdir, self.datadir) ++ self.assertEqual(state.upgrade_command, "system_upgrade") ++ ++ def test_transaction_download_offline_upgrade(self): ++ pkg = mock.MagicMock() ++ repo = mock.MagicMock() ++ repo.id = 'test' ++ pkg.name = "kernel" ++ pkg.repo = repo ++ self.cli.base.transaction.install_set = [pkg] ++ self.command.opts = mock.MagicMock() ++ self.command.opts.distro_sync = True ++ self.command.opts.command = "offline-upgrade" ++ self.command.opts.repos_ed = [] ++ self.cli.demands.allow_erasing = "allow_erasing" ++ self.command.base.conf.best = True ++ self.command.base.conf.releasever = "35" ++ self.command.base.conf.gpgcheck = True ++ self.command.opts.destdir = self.datadir ++ self.command.base.conf.install_weak_deps = True ++ self.command.base.conf.module_platform_id = '' ++ self.command.pre_configure_download() ++ self.command.transaction_download() ++ with system_upgrade.State(self.command.state.statefile) as state: ++ self.assertEqual(state.download_status, "complete") ++ self.assertEqual(state.distro_sync, False) ++ self.assertEqual(state.destdir, self.datadir) ++ self.assertEqual(state.upgrade_command, "offline-upgrade") ++ ++ ++class UpgradeCommandTestCase(CommandTestCase): ++ def test_pre_configure_upgrade(self): ++ with self.command.state as state: ++ state.destdir = "/grape/wine" ++ state.target_releasever = "35" ++ self.command.pre_configure_upgrade() ++ self.assertEqual(self.command.base.conf.destdir, "/grape/wine") ++ self.assertEqual(self.command.base.conf.releasever, "35") ++ ++ def test_configure_upgrade(self): ++ # write state like download would have ++ with self.command.state as state: ++ state.download_status = "complete" ++ state.distro_sync = True ++ state.allow_erasing = True ++ state.best = True ++ # okay, now configure upgrade ++ self.command.opts = mock.MagicMock() ++ self.command.opts.tid = "upgrade" ++ self.command.configure() ++ # did we reset the depsolving flags? ++ self.assertTrue(self.command.opts.distro_sync) ++ self.assertTrue(self.cli.demands.allow_erasing) ++ self.assertTrue(self.command.base.conf.best) ++ # are we on autopilot? ++ self.assertTrue(self.command.base.conf.assumeyes) ++ self.assertTrue(self.cli.demands.cacheonly) ++ ++ ++class LogCommandTestCase(CommandTestCase): ++ def test_configure_log(self): ++ self.command.opts = mock.MagicMock() ++ self.command.opts.tid = "log" ++ self.command.configure() ++ ++ def test_run_log_list(self): ++ self.command.opts = mock.MagicMock() ++ self.command.opts.number = None ++ with patch('system_upgrade.list_logs') as list_logs: ++ self.command.run_log() ++ list_logs.assert_called_once_with() ++ ++ def test_run_log_prev(self): ++ with patch('system_upgrade.show_log') as show_log: ++ self.command.opts = mock.MagicMock() ++ self.command.opts.number = -2 ++ self.command.run_log() ++ show_log.assert_called_once_with(-2) +-- +2.38.1 + diff --git a/SOURCES/0001-copr-Guess-EPEL-chroots-for-CentOS-Stream-RhBug-2058.patch b/SOURCES/0001-copr-Guess-EPEL-chroots-for-CentOS-Stream-RhBug-2058.patch deleted file mode 100644 index 751d9d2..0000000 --- a/SOURCES/0001-copr-Guess-EPEL-chroots-for-CentOS-Stream-RhBug-2058.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 579ef1bb577807090a114378219a812ec26b724a Mon Sep 17 00:00:00 2001 -From: Carl George -Date: Mon, 27 Jun 2022 23:12:05 -0500 -Subject: [PATCH] copr: Guess EPEL chroots for CentOS Stream (RhBug:2058471) - -Packages built in epel-9 chroots are almost always compatible with -CentOS Stream 9. Not having the copr plugin guess this chroot is -causing user friction. Users are creating epel-9 chroots expecting them -to work for both CentOS Stream 9 and RHEL 9. When they get reports -about `dnf copr enable` not working, they try to add a centos-stream-9 -chroot, only to discover the dependencies they need from EPEL are not -available. - -Instead of making the majority of CentOS Stream users include an -explicit chroot argument, let's reserve that workaround only for the -people that don't want their CentOS Stream systems picking the EPEL -chroot. ---- - plugins/copr.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/plugins/copr.py b/plugins/copr.py -index 297210b..16946b7 100644 ---- a/plugins/copr.py -+++ b/plugins/copr.py -@@ -469,8 +469,6 @@ Bugzilla. In case of problems, contact the owner of this repository. - chroot = ("opensuse-tumbleweed-{}".format(distarch)) - else: - chroot = ("opensuse-leap-{0}-{1}".format(dist[1], distarch)) -- elif "CentOS Stream" in dist: -- chroot = ("centos-stream-{0}-{1}".format(dist[1], distarch)) - else: - chroot = ("epel-%s-x86_64" % dist[1].split(".", 1)[0]) - return chroot --- -2.36.1 - diff --git a/SOURCES/0002-Add-a-warning-when-using-system-upgrade-on-RHEL.patch b/SOURCES/0002-Add-a-warning-when-using-system-upgrade-on-RHEL.patch new file mode 100644 index 0000000..8cf7eae --- /dev/null +++ b/SOURCES/0002-Add-a-warning-when-using-system-upgrade-on-RHEL.patch @@ -0,0 +1,78 @@ +From 307641a869134de4ebd496d1a78e5ff128a26293 Mon Sep 17 00:00:00 2001 +From: Jan Kolarik +Date: Fri, 30 Sep 2022 11:36:26 +0000 +Subject: [PATCH 2/4] Add a warning when using `system-upgrade` on RHEL + +--- + dnf-plugins-core.spec | 3 +-- + doc/system-upgrade.rst | 6 ++++-- + plugins/system_upgrade.py | 4 ++++ + 3 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec +index 4df6e44..1ee87a1 100644 +--- a/dnf-plugins-core.spec ++++ b/dnf-plugins-core.spec +@@ -148,14 +148,13 @@ Summary: Core Plugins for DNF + %{?python_provide:%python_provide python3-%{name}} + BuildRequires: python3-dbus + BuildRequires: python3-devel ++BuildRequires: python3-distro + BuildRequires: python3-dnf >= %{dnf_lowest_compatible} + BuildRequires: python3-systemd + BuildRequires: pkgconfig(systemd) + BuildRequires: systemd + %{?systemd_ordering} +-%if 0%{?fedora} + Requires: python3-distro +-%endif + Requires: python3-dbus + Requires: python3-dnf >= %{dnf_lowest_compatible} + Requires: python3-hawkey >= %{hawkey_version} +diff --git a/doc/system-upgrade.rst b/doc/system-upgrade.rst +index 3110460..87b7319 100644 +--- a/doc/system-upgrade.rst ++++ b/doc/system-upgrade.rst +@@ -27,13 +27,15 @@ DNF system-upgrades plugin provides three commands: ``system-upgrade``, ``offlin + ``offline-distrosync``. Only ``system-upgrade`` command requires increase of distribution major + version (``--releasever``) compared to installed version. + +-``dnf system-upgrade`` can be used to upgrade a Fedora system to a new major +-release. It replaces fedup (the old Fedora Upgrade tool). Before you proceed ensure that your system ++``dnf system-upgrade`` is a recommended way to upgrade a system to a new major release. ++It replaces fedup (the old Fedora Upgrade tool). Before you proceed ensure that your system + is fully upgraded (``dnf --refresh upgrade``). + + The ``system-upgrade`` command also performes additional actions necessary for the upgrade of the + system, for example an upgrade of groups and environments. + ++.. WARNING:: The ``system-upgrade`` command is not supported on the RHEL distribution. ++ + -------- + Synopsis + -------- +diff --git a/plugins/system_upgrade.py b/plugins/system_upgrade.py +index fee6762..0baf978 100644 +--- a/plugins/system_upgrade.py ++++ b/plugins/system_upgrade.py +@@ -20,6 +20,7 @@ + """system_upgrade.py - DNF plugin to handle major-version system upgrades.""" + + from subprocess import call, Popen, check_output, CalledProcessError ++import distro + import json + import os + import os.path +@@ -451,6 +452,9 @@ class SystemUpgradeCommand(dnf.cli.Command): + + def configure_download(self): + if 'system-upgrade' == self.opts.command or 'fedup' == self.opts.command: ++ if distro.id() == 'rhel': ++ logger.warning(_('WARNING: this operation is not supported on the RHEL distribution. ' ++ 'Proceed at your own risk.')) + help_url = get_url_from_os_release() + if help_url: + msg = _('Additional information for System Upgrade: {}') +-- +2.38.1 + diff --git a/SOURCES/0002-Update-translations.patch b/SOURCES/0002-Update-translations.patch deleted file mode 100644 index 84db0c5..0000000 --- a/SOURCES/0002-Update-translations.patch +++ /dev/null @@ -1,2786 +0,0 @@ -From 328db1e97471fe2b4a08a8eb7de5800c3cf057c5 Mon Sep 17 00:00:00 2001 -From: Marek Blaha -Date: Wed, 14 Sep 2022 16:22:01 +0200 -Subject: [PATCH] Update translations - ---- - po/fr.po | 166 ++++++++++++----------- - po/ja.po | 346 ++++++++++++++++++++++++++--------------------- - po/ko.po | 382 ++++++++++++++++++++++++++++------------------------ - po/zh_CN.po | 230 +++++++++++++++---------------- - 4 files changed, 598 insertions(+), 526 deletions(-) - -diff --git a/po/fr.po b/po/fr.po -index 3ed3dba..f2134f2 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -6,21 +6,23 @@ - # Ludek Janda , 2018. #zanata, 2021. - # Jean-Baptiste Holcroft , 2019. #zanata, 2020. - # Julien Humbert , 2020, 2021. --# Arnaud T. , 2021. -+# Sundeep Anand , 2021. -+# Transtats , 2022. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2022-01-11 01:55+0000\n" --"PO-Revision-Date: 2021-10-08 05:05+0000\n" --"Last-Translator: Julien Humbert \n" --"Language-Team: French \n" -+"POT-Creation-Date: 2022-08-31 13:39+0200\n" -+"PO-Revision-Date: 2022-03-09 12:39+0000\n" -+"Last-Translator: Transtats \n" -+"Language-Team: French \n" - "Language: fr\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=n > 1;\n" --"X-Generator: Weblate 4.8\n" -+"X-Generator: Weblate 4.11.2\n" - - #: plugins/builddep.py:45 - msgid "[PACKAGE|PACKAGE.spec]" -@@ -41,8 +43,7 @@ msgstr "définit une macro pour l’interprétation du fichier spec" - - #: plugins/builddep.py:95 - msgid "skip build dependencies not available in repositories" --msgstr "" --"ignorer les dépendances de compilation non disponibles dans les dépôts" -+msgstr "ignorer les dépendances de compilation non disponibles dans les dépôts" - - #: plugins/builddep.py:98 - msgid "treat commandline arguments as spec files" -@@ -61,8 +62,7 @@ msgid "Some packages could not be found." - msgstr "Certains paquets n’ont pu être trouvés." - - #. No provides, no files --#. Richdeps can have no matches but it could be correct (solver must decide --#. later) -+#. Richdeps can have no matches but it could be correct (solver must decide later) - #: plugins/builddep.py:173 - #, python-format - msgid "No matching package to install: '%s'" -@@ -82,7 +82,7 @@ msgstr "Toutes les dépendances ne sont pas satisfaites" - msgid "Failed to open: '%s', not a valid spec file: %s" - msgstr "Échec à l’ouverture de « %s », %s n’est pas un fichier spec valide" - --#: plugins/builddep.py:230 plugins/repoclosure.py:118 -+#: plugins/builddep.py:230 plugins/repoclosure.py:124 - #, python-format - msgid "no package matched: %s" - msgstr "aucun paquet ne correspond à : %s" -@@ -297,49 +297,49 @@ msgstr "Lister les dépôts Copr disponibles par NOM d’utilisateur" - msgid "Specify an instance of Copr to work with" - msgstr "Précisez une instance Copr avec laquelle travailler" - --#: plugins/copr.py:164 plugins/copr.py:232 plugins/copr.py:259 -+#: plugins/copr.py:164 plugins/copr.py:236 plugins/copr.py:263 - msgid "Error: " - msgstr "Erreur : " - - #: plugins/copr.py:165 - msgid "" --"specify Copr hub either with `--hub` or using " --"`copr_hub/copr_username/copr_projectname` format" -+"specify Copr hub either with `--hub` or using `copr_hub/copr_username/" -+"copr_projectname` format" - msgstr "" --"précisez un hub Copr soit via `--hub` ou en utilisant le format " --"`hub_copr/utilisateur_copr/projet_copr`" -+"précisez un hub Copr soit via `--hub` ou en utilisant le format `hub_copr/" -+"utilisateur_copr/projet_copr`" - - #: plugins/copr.py:168 - msgid "multiple hubs specified" - msgstr "de multiples hubs ont été renseignés" - --#: plugins/copr.py:233 plugins/copr.py:237 -+#: plugins/copr.py:237 plugins/copr.py:241 - msgid "exactly two additional parameters to copr command are required" - msgstr "la commande copr requiert exactement deux paramètres additionnels" - --#: plugins/copr.py:242 -+#: plugins/copr.py:246 - msgid "Too many arguments." --msgstr "Trop de paramètres." -+msgstr "Trop d'arguments." - --#: plugins/copr.py:245 -+#: plugins/copr.py:249 - msgid "" - "Bad format of optional chroot. The format is distribution-version-" - "architecture." - msgstr "" --"Mauvais format de chroot facultatif. Le format est distribution-version-" -+"Mauvais format du chroot optionnel. Le format est distribution-version-" - "architecture." - --#: plugins/copr.py:260 -+#: plugins/copr.py:264 - msgid "use format `copr_username/copr_projectname` to reference copr project" - msgstr "" - "utilisez le format `copr_username/copr_projectname` pour faire référence au " - "projet copr" - --#: plugins/copr.py:262 -+#: plugins/copr.py:266 - msgid "bad copr project format" - msgstr "mauvais format de projet copr" - --#: plugins/copr.py:276 -+#: plugins/copr.py:280 - msgid "" - "\n" - "Enabling a Copr repository. Please note that this repository is not part\n" -@@ -347,7 +347,8 @@ msgid "" - "\n" - "The Fedora Project does not exercise any power over the contents of\n" - "this repository beyond the rules outlined in the Copr FAQ at\n" --",\n" -+",\n" - "and packages are not held to any quality or security level.\n" - "\n" - "Please do not file bug reports about these packages in Fedora\n" -@@ -359,97 +360,97 @@ msgstr "" - "\n" - "Le projet Fedora n’exerce aucun pouvoir sur le contenu de ce dépôt au delà\n" - "des règles précisées dans la FAQ Copr \n" --",\n" -+",\n" - "et les paquets ne sont tenus à aucun niveau de qualité ou de sécurité.\n" - "\n" --"Veuillez ne pas signaler de bogues à propos de ces paquets dans le Bugzilla de Fedora.\n" -+"Veuillez ne pas signaler de bogues à propos de ces paquets dans le Bugzilla " -+"de Fedora.\n" - "En cas de problèmes, contactez le propriétaire de ce dépôt.\n" - --#: plugins/copr.py:293 -+#: plugins/copr.py:297 - msgid "Repository successfully enabled." - msgstr "Activation du dépôt réussie." - --#: plugins/copr.py:298 -+#: plugins/copr.py:302 - msgid "Repository successfully disabled." - msgstr "Désactivation du dépôt réussie." - --#: plugins/copr.py:302 -+#: plugins/copr.py:306 - msgid "Repository successfully removed." - msgstr "Suppression du dépôt réussie." - --#: plugins/copr.py:306 plugins/copr.py:719 -+#: plugins/copr.py:310 plugins/copr.py:721 - msgid "Unknown subcommand {}." - msgstr "Sous-commande inconnue {}." - --#: plugins/copr.py:363 -+#: plugins/copr.py:367 - msgid "" --"* These coprs have repo file with an old format that contains no information" --" about Copr hub - the default one was assumed. Re-enable the project to fix " -+"* These coprs have repo file with an old format that contains no information " -+"about Copr hub - the default one was assumed. Re-enable the project to fix " - "this." - msgstr "" - "* Ces Copr ont des fichiers de dépôts avec un ancien format qui ne contient " - "aucune information à propos de Copr hub - celui par défaut a été utilisé. " - "Réactivez le projet pour résoudre le problème." - --#: plugins/copr.py:376 -+#: plugins/copr.py:380 - msgid "Can't parse repositories for username '{}'." - msgstr "" - "Ne peut analyser les dépôts pour y chercher le nom d’utilisateur « {} »." - --#: plugins/copr.py:379 -+#: plugins/copr.py:383 - msgid "List of {} coprs" - msgstr "Liste de {} coprs" - --#: plugins/copr.py:384 -+#: plugins/copr.py:388 - msgid "No description given" - msgstr "Aucune description fournie" - --#: plugins/copr.py:396 -+#: plugins/copr.py:400 - msgid "Can't parse search for '{}'." - msgstr "Impossible d’analyser la recherche pour « {} »." - --#: plugins/copr.py:399 -+#: plugins/copr.py:403 - msgid "Matched: {}" - msgstr "Correspondance : {}" - --#: plugins/copr.py:404 -+#: plugins/copr.py:408 - msgid "No description given." - msgstr "Pas de description fournie." - --#: plugins/copr.py:426 -+#: plugins/copr.py:430 - msgid "Safe and good answer. Exiting." - msgstr "Réponse sûre et exacte. Fin." - --#: plugins/copr.py:433 -+#: plugins/copr.py:437 - msgid "This command has to be run under the root user." - msgstr "Cette commande requiert les privilèges du super utilisateur." - --#: plugins/copr.py:485 -+#: plugins/copr.py:487 - #, python-brace-format - msgid "Request to {0} failed: {1} - {2}" - msgstr "" - --#: plugins/copr.py:487 -+#: plugins/copr.py:489 - msgid "It wasn't possible to enable this project.\n" - msgstr "" - --#: plugins/copr.py:492 -+#: plugins/copr.py:494 - #, fuzzy, python-brace-format - #| msgid "Such repository does not exist." - msgid "Repository '{0}' does not exist in project '{1}'." - msgstr "Ce dépôt n’existe pas." - --#: plugins/copr.py:495 -+#: plugins/copr.py:497 - #, fuzzy - #| msgid "List enabled Copr repositories" - msgid "" - "\n" - "Available repositories: " --msgstr "" --"\n" --"Lister les dépôts Copr activés " -+msgstr "Lister les dépôts Copr activés" - --#: plugins/copr.py:497 -+#: plugins/copr.py:499 - #, python-brace-format - msgid "" - "\n" -@@ -459,19 +460,19 @@ msgid "" - "But note that the installed repo file will likely need a manual modification." - msgstr "" - --#: plugins/copr.py:503 -+#: plugins/copr.py:505 - #, fuzzy, python-brace-format - #| msgid "Such repository does not exist." - msgid "Project {0} does not exist." - msgstr "Ce dépôt n’existe pas." - --#: plugins/copr.py:506 -+#: plugins/copr.py:508 - #, fuzzy, python-brace-format - #| msgid "Failed to remove copr repo {0}/{1}/{2}" - msgid "Failed to connect to {0}: {1}" - msgstr "Échec de la suppression du dépôt Copr {0}/{1}/{2}" - --#: plugins/copr.py:553 -+#: plugins/copr.py:555 - #, python-brace-format - msgid "" - "Maintainer of the enabled Copr repository decided to make\n" -@@ -500,44 +501,44 @@ msgstr "" - "\n" - "Ces dépôts ont été activés automatiquement." - --#: plugins/copr.py:574 -+#: plugins/copr.py:576 - msgid "Do you want to keep them enabled?" - msgstr "Souhaitez-vous les maintenir activés ?" - --#: plugins/copr.py:607 -+#: plugins/copr.py:609 - #, python-brace-format - msgid "Failed to remove copr repo {0}/{1}/{2}" - msgstr "Échec de la suppression du dépôt Copr {0}/{1}/{2}" - --#: plugins/copr.py:618 -+#: plugins/copr.py:620 - msgid "Failed to disable copr repo {}/{}" - msgstr "Échec de la désactivation du dépôt copr {}/{}" - --#: plugins/copr.py:636 plugins/copr.py:673 -+#: plugins/copr.py:638 plugins/copr.py:675 - msgid "Unknown response from server." - msgstr "Réponse inconnue du serveur." - --#: plugins/copr.py:658 -+#: plugins/copr.py:660 - msgid "Interact with Playground repository." - msgstr "Interagit avec le dépôt Playground." - --#: plugins/copr.py:664 -+#: plugins/copr.py:666 - msgid "Enabling a Playground repository." - msgstr "Activation d’un dépôt Playground." - --#: plugins/copr.py:665 -+#: plugins/copr.py:667 - msgid "Do you want to continue?" - msgstr "Souhaitez-vous continuer ?" - --#: plugins/copr.py:709 -+#: plugins/copr.py:711 - msgid "Playground repositories successfully enabled." - msgstr "Activation des dépôts Playground réussie." - --#: plugins/copr.py:712 -+#: plugins/copr.py:714 - msgid "Playground repositories successfully disabled." - msgstr "Désactivation des dépôts Playground réussie." - --#: plugins/copr.py:716 -+#: plugins/copr.py:718 - msgid "Playground repositories successfully updated." - msgstr "Mise à jour des dépôts Playground réussie." - -@@ -623,8 +624,7 @@ msgstr "" - msgid "" - "Could not find debugsource package for the following available packages: %s" - msgstr "" --"Impossible de trouver le paquet debugsource pour ces paquets disponibles : " --"%s" -+"Impossible de trouver le paquet debugsource pour ces paquets disponibles : %s" - - #: plugins/debuginfo-install.py:190 - #, python-format -@@ -827,8 +827,8 @@ msgstr "Les paquets ne peuvent pas être retirés d'un groupe qui n'existe pas" - - #: plugins/groups_manager.py:307 - msgid "" --"Group id '{}' generated from '{}' is duplicit. Please specify group id using" --" --id." -+"Group id '{}' generated from '{}' is duplicit. Please specify group id using " -+"--id." - msgstr "" - "L'id du groupe « {} » qui a été généré pour « {} » est en double. Veuillez " - "le spécifier en utilisant --id." -@@ -1012,25 +1012,27 @@ msgstr "post-transaction-actions : mauvaise commande « %s » : %s" - msgid "Display a list of unresolved dependencies for repositories" - msgstr "Affiche une liste de dépendances non résolues pour les dépôts" - --#: plugins/repoclosure.py:66 --msgid "Repoclosure ended with unresolved dependencies." -+#: plugins/repoclosure.py:69 -+#, fuzzy -+#| msgid "Repoclosure ended with unresolved dependencies." -+msgid "Repoclosure ended with unresolved dependencies ({}) across {} packages." - msgstr "Repoclosure a terminé avec des dépendances non-résolues." - --#: plugins/repoclosure.py:153 -+#: plugins/repoclosure.py:159 - msgid "check packages of the given archs, can be specified multiple times" - msgstr "" - "vérifie les paquets pour les architectures spécifiées, peut être utilisé " - "plusieurs fois" - --#: plugins/repoclosure.py:156 -+#: plugins/repoclosure.py:162 - msgid "Specify repositories to check" - msgstr "Spécifie les dépôts à vérifier" - --#: plugins/repoclosure.py:158 -+#: plugins/repoclosure.py:164 - msgid "Check only the newest packages in the repos" - msgstr "Vérifier uniquement les paquets les plus récents dans les dépôts" - --#: plugins/repoclosure.py:161 -+#: plugins/repoclosure.py:167 - msgid "Check closure for this package only" - msgstr "Vérifie la clôture pour ce paquet seulement" - -@@ -1060,11 +1062,10 @@ msgstr "Affichez des données supplémentaires sur la taille des changements." - - #: plugins/repodiff.py:69 - msgid "" --"Compare packages also by arch. By default packages are compared just by " --"name." -+"Compare packages also by arch. By default packages are compared just by name." - msgstr "" --"Compare également les paquets par architecture. Par défaut, les paquets sont" --" uniquement comparés par nom." -+"Compare également les paquets par architecture. Par défaut, les paquets sont " -+"uniquement comparés par nom." - - #: plugins/repodiff.py:72 - msgid "Output a simple one line message for modified packages." -@@ -1247,11 +1248,11 @@ msgstr "également télécharger et décompresser comps.xml" - - #: plugins/reposync.py:75 - msgid "" --"where to store downloaded repository metadata. Defaults to the value of " --"--download-path." -+"where to store downloaded repository metadata. Defaults to the value of --" -+"download-path." - msgstr "" --"là où stocker les métadonnées du dépôt. Prend par défaut la valeur de " --"--download-path." -+"là où stocker les métadonnées du dépôt. Prend par défaut la valeur de --" -+"download-path." - - #: plugins/reposync.py:78 - msgid "download only newest packages per-repo" -@@ -1374,7 +1375,8 @@ msgstr "" - "appliquées : {}" - - #: plugins/versionlock.py:44 --msgid "Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" -+msgid "" -+"Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" - msgstr "" - "Plugin versionlock : nombre de règles d’exclusion du fichier \"{}\" " - "appliquées : {}" -diff --git a/po/ja.po b/po/ja.po -index e5ac84c..87ce45a 100644 ---- a/po/ja.po -+++ b/po/ja.po -@@ -1,20 +1,23 @@ - # Ooyama Yosiyuki , 2015. #zanata - # Ludek Janda , 2018. #zanata, 2021. - # Casey Jones , 2020. -+# Sundeep Anand , 2021. -+# Transtats , 2022. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2022-01-11 01:55+0000\n" --"PO-Revision-Date: 2021-09-11 10:04+0000\n" --"Last-Translator: Ludek Janda \n" --"Language-Team: Japanese \n" -+"POT-Creation-Date: 2022-08-31 13:39+0200\n" -+"PO-Revision-Date: 2022-09-07 14:19+0000\n" -+"Last-Translator: Transtats \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" - "Plural-Forms: nplurals=1; plural=0;\n" --"X-Generator: Weblate 4.8\n" -+"X-Generator: Weblate 4.14\n" - - #: plugins/builddep.py:45 - msgid "[PACKAGE|PACKAGE.spec]" -@@ -54,8 +57,7 @@ msgid "Some packages could not be found." - msgstr "一部のパッケージは見つかりませんでした。" - - #. No provides, no files --#. Richdeps can have no matches but it could be correct (solver must decide --#. later) -+#. Richdeps can have no matches but it could be correct (solver must decide later) - #: plugins/builddep.py:173 - #, python-format - msgid "No matching package to install: '%s'" -@@ -64,7 +66,8 @@ msgstr "インストール用の一致するパッケージがありません: ' - #: plugins/builddep.py:191 - #, python-format - msgid "Failed to open: '%s', not a valid source rpm file." --msgstr "開くことに失敗しました: '%s'、有効なソース rpm ファイルではありません。" -+msgstr "" -+"開くことに失敗しました: '%s'、有効なソース rpm ファイルではありません。" - - #: plugins/builddep.py:204 plugins/builddep.py:220 plugins/builddep.py:237 - msgid "Not all dependencies satisfied" -@@ -75,7 +78,7 @@ msgstr "すべての依存関係が満たされているわけではない" - msgid "Failed to open: '%s', not a valid spec file: %s" - msgstr "開くことに失敗しました: '%s'、有効なスペックファイルではありません: %s" - --#: plugins/builddep.py:230 plugins/repoclosure.py:118 -+#: plugins/builddep.py:230 plugins/repoclosure.py:124 - #, python-format - msgid "no package matched: %s" - msgstr "一致するパッケージはありません: %s" -@@ -93,7 +96,9 @@ msgstr "パッケージの changelog データを表示します" - msgid "" - "show changelog entries since DATE. To avoid ambiguosity, YYYY-MM-DD format " - "is recommended." --msgstr "DATE 以降の changelog エントリーを表示します。不明瞭さを避けるため、YYYY-MM-DD のフォーマットが推奨されます。" -+msgstr "" -+"DATE 以降の changelog エントリーを表示します。不明瞭さを避けるため、YYYY-MM-" -+"DD のフォーマットが推奨されます。" - - #: plugins/changelog.py:55 - msgid "show given number of changelog entries per package" -@@ -104,7 +109,8 @@ msgid "" - "show only new changelog entries for packages, that provide an upgrade for " - "some of already installed packages." - msgstr "" --"パッケージ向けの新しい changelog エントリーのみを表示します。これは、インストール済みのパッケージの一部にアップグレードを提供します。" -+"パッケージ向けの新しい changelog エントリーのみを表示します。これは、インス" -+"トール済みのパッケージの一部にアップグレードを提供します。" - - #: plugins/changelog.py:60 - msgid "PACKAGE" -@@ -126,7 +132,9 @@ msgstr[0] "最新の changelog のみを一覧表示します" - - #: plugins/changelog.py:116 - msgid "Listing only new changelogs since installed version of the package" --msgstr "パッケージのインストールされたバージョン以降の新しい changelogs のみを一覧表示します" -+msgstr "" -+"パッケージのインストールされたバージョン以降の新しい changelogs のみを一覧表" -+"示します" - - #: plugins/changelog.py:118 - msgid "Listing all changelogs" -@@ -178,8 +186,8 @@ msgid "" - "Warning: --enablerepo/--disablerepo arguments have no meaningwith config " - "manager. Use --set-enabled/--set-disabled instead." - msgstr "" --"警告: --enablerepo/--disablerepo の引数は config manager では意味がありません。代わりに -set-" --"enabled/--set-disabled を使用してください。" -+"警告: --enablerepo/--disablerepo の引数は config manager では意味がありませ" -+"ん。代わりに -set-enabled/--set-disabled を使用してください。" - - #: plugins/config_manager.py:132 - #, python-format -@@ -261,7 +269,8 @@ msgstr "" - - #: plugins/copr.py:120 - msgid "List all installed Copr repositories (default)" --msgstr "インストール済みのすべての Copr リポジトリーを一覧表示します (デフォルト)" -+msgstr "" -+"インストール済みのすべての Copr リポジトリーを一覧表示します (デフォルト)" - - #: plugins/copr.py:122 - msgid "List enabled Copr repositories" -@@ -279,45 +288,49 @@ msgstr "利用可能な Copr リポジトリーをユーザー NAME ごとに一 - msgid "Specify an instance of Copr to work with" - msgstr "作業する Copr のインスタンスを指定します" - --#: plugins/copr.py:164 plugins/copr.py:232 plugins/copr.py:259 -+#: plugins/copr.py:164 plugins/copr.py:236 plugins/copr.py:263 - msgid "Error: " - msgstr "エラー: " - - #: plugins/copr.py:165 - msgid "" --"specify Copr hub either with `--hub` or using " --"`copr_hub/copr_username/copr_projectname` format" -+"specify Copr hub either with `--hub` or using `copr_hub/copr_username/" -+"copr_projectname` format" - msgstr "" --"`--hub` または `copr_hub/copr_username/copr_projectname` フォーマットを使って、Copr " --"ハブを指定します" -+"`--hub` または `copr_hub/copr_username/copr_projectname` フォーマットを使っ" -+"て、Copr ハブを指定します" - - #: plugins/copr.py:168 - msgid "multiple hubs specified" - msgstr "複数のハブが指定されています" - --#: plugins/copr.py:233 plugins/copr.py:237 -+#: plugins/copr.py:237 plugins/copr.py:241 - msgid "exactly two additional parameters to copr command are required" - msgstr "copr コマンドに厳密に 2 つの追加パラメーターが必要です" - --#: plugins/copr.py:242 -+#: plugins/copr.py:246 - msgid "Too many arguments." - msgstr "引数が多すぎます。" - --#: plugins/copr.py:245 -+#: plugins/copr.py:249 - msgid "" - "Bad format of optional chroot. The format is distribution-version-" - "architecture." --msgstr "オプションの chroot の形式が無効です。正しい形式は distribution-version-architecture です。" -+msgstr "" -+"オプションの chroot の形式が無効です。正しい形式は distribution-version-" -+"architecture です。" - --#: plugins/copr.py:260 -+#: plugins/copr.py:264 - msgid "use format `copr_username/copr_projectname` to reference copr project" --msgstr "copr プロジェクトを参照するには `copr_username/copr_projectname` 形式を使用します" -+msgstr "" -+"copr プロジェクトを参照するには `copr_username/copr_projectname` 形式を使用し" -+"ます" - --#: plugins/copr.py:262 -+#: plugins/copr.py:266 - msgid "bad copr project format" - msgstr "不正な copr プロジェクト形式" - --#: plugins/copr.py:276 -+#: plugins/copr.py:280 - msgid "" - "\n" - "Enabling a Copr repository. Please note that this repository is not part\n" -@@ -325,7 +338,8 @@ msgid "" - "\n" - "The Fedora Project does not exercise any power over the contents of\n" - "this repository beyond the rules outlined in the Copr FAQ at\n" --",\n" -+",\n" - "and packages are not held to any quality or security level.\n" - "\n" - "Please do not file bug reports about these packages in Fedora\n" -@@ -333,9 +347,11 @@ msgid "" - msgstr "" - "\n" - "Copr リポジトリーを有効化しています。このリポジトリーは\n" --"主要ディストリビューションの一部ではないため、品質が一定していない点に注意してください。\n" -+"主要ディストリビューションの一部ではないため、品質が一定していない点に注意し" -+"てください。\n" - "\n" --"Fedora Project は、このリポジトリーのコンテンツに関して、 の \n" -+"Fedora Project は、このリポジトリーのコンテンツに関して、 の \n" - "Copr FAQ で示されたルールを超えて権利を行使することは\n" - "ありません。また、パッケージは、任意の品質またはセキュリ\n" - "ティーレベルを固守していません。\n" -@@ -343,89 +359,87 @@ msgstr "" - "Fedora Bugzilla でこれらのパッケージに関するバグ報告をしないでください。\n" - "問題が発生した場合は、このリポジトリーのオーナーに連絡してください。\n" - --#: plugins/copr.py:293 -+#: plugins/copr.py:297 - msgid "Repository successfully enabled." - msgstr "リポジトリが正常に有効化されました。" - --#: plugins/copr.py:298 -+#: plugins/copr.py:302 - msgid "Repository successfully disabled." - msgstr "リポジトリが正常に無効化されました。" - --#: plugins/copr.py:302 -+#: plugins/copr.py:306 - msgid "Repository successfully removed." - msgstr "リポジトリーが正常に削除されました。" - --#: plugins/copr.py:306 plugins/copr.py:719 -+#: plugins/copr.py:310 plugins/copr.py:721 - msgid "Unknown subcommand {}." - msgstr "不明なサブコマンド {}。" - --#: plugins/copr.py:363 -+#: plugins/copr.py:367 - msgid "" --"* These coprs have repo file with an old format that contains no information" --" about Copr hub - the default one was assumed. Re-enable the project to fix " -+"* These coprs have repo file with an old format that contains no information " -+"about Copr hub - the default one was assumed. Re-enable the project to fix " - "this." - msgstr "" - "* これらの coprs には、Copr ハブに関する情報がない古いフォーマットの repo " --"ファイルがあります。デフォルトは仮定です。これを修正するには、プロジェクトを再度有効化してください。" -+"ファイルがあります。デフォルトは仮定です。これを修正するには、プロジェクトを" -+"再度有効化してください。" - --#: plugins/copr.py:376 -+#: plugins/copr.py:380 - msgid "Can't parse repositories for username '{}'." - msgstr "ユーザー名 '{}' のリポジトリーを解析できません。" - --#: plugins/copr.py:379 -+#: plugins/copr.py:383 - msgid "List of {} coprs" - msgstr "{} coprs の一覧" - --#: plugins/copr.py:384 -+#: plugins/copr.py:388 - msgid "No description given" - msgstr "説明がありません" - --#: plugins/copr.py:396 -+#: plugins/copr.py:400 - msgid "Can't parse search for '{}'." - msgstr "'{}' の検索を解析できません。" - --#: plugins/copr.py:399 -+#: plugins/copr.py:403 - msgid "Matched: {}" - msgstr "一致: {}" - --#: plugins/copr.py:404 -+#: plugins/copr.py:408 - msgid "No description given." - msgstr "説明が与えられていません。" - --#: plugins/copr.py:426 -+#: plugins/copr.py:430 - msgid "Safe and good answer. Exiting." - msgstr "安全で優れた回答。終了中。" - --#: plugins/copr.py:433 -+#: plugins/copr.py:437 - msgid "This command has to be run under the root user." - msgstr "このコマンドは root ユーザーの下で実行する必要があります。" - --#: plugins/copr.py:485 -+#: plugins/copr.py:487 - #, python-brace-format - msgid "Request to {0} failed: {1} - {2}" --msgstr "" -+msgstr "{0} へのリクエストに失敗しました: {1} - {2}" - --#: plugins/copr.py:487 -+#: plugins/copr.py:489 - msgid "It wasn't possible to enable this project.\n" --msgstr "" -+msgstr "このプロジェクトを有効にすることができませんでした。\n" - --#: plugins/copr.py:492 --#, fuzzy, python-brace-format --#| msgid "Such repository does not exist." -+#: plugins/copr.py:494 -+#, python-brace-format - msgid "Repository '{0}' does not exist in project '{1}'." --msgstr "そのようなリポジトリーは存在しません。" -+msgstr "'{0}' リポジトリーはプロジェクト '{1}' に存在しません。" - --#: plugins/copr.py:495 --#, fuzzy --#| msgid "List enabled Copr repositories" -+#: plugins/copr.py:497 - msgid "" - "\n" - "Available repositories: " - msgstr "" - "\n" --"有効化された Copr リポジトリーを一覧表示します " -+"利用可能なリポジトリー: " - --#: plugins/copr.py:497 -+#: plugins/copr.py:499 - #, python-brace-format - msgid "" - "\n" -@@ -434,20 +448,24 @@ msgid "" - " 'dnf copr enable {0} '\n" - "But note that the installed repo file will likely need a manual modification." - msgstr "" -+"\n" -+"\n" -+"デフォルト以外のリポジトリーを有効にする場合は、以下のコマンドを使用します:\n" -+" 'dnf copr enable {0} '\n" -+"ただし、インストールされているリポジトリーファイルを手動で変更する必要がある" -+"可能性があることに注意してください。" - --#: plugins/copr.py:503 --#, fuzzy, python-brace-format --#| msgid "Such repository does not exist." -+#: plugins/copr.py:505 -+#, python-brace-format - msgid "Project {0} does not exist." --msgstr "そのようなリポジトリーは存在しません。" -+msgstr "プロジェクト {0} は存在しません。" - --#: plugins/copr.py:506 --#, fuzzy, python-brace-format --#| msgid "Failed to remove copr repo {0}/{1}/{2}" -+#: plugins/copr.py:508 -+#, python-brace-format - msgid "Failed to connect to {0}: {1}" --msgstr "copr repo {0}/{1}/{2} の削除に失敗しました" -+msgstr "{0} への接続に失敗しました: {1}" - --#: plugins/copr.py:553 -+#: plugins/copr.py:555 - #, python-brace-format - msgid "" - "Maintainer of the enabled Copr repository decided to make\n" -@@ -463,59 +481,58 @@ msgid "" - "\n" - "These repositories have been enabled automatically." - msgstr "" --"有効化した Copr リポジトリの管理者は\n" --"他のリポジトリに依存するように決めました。\n" --"そのようなリポジトリは主な Corp レジストリー\n" --"ランタイム依存関係を提供) から RPM のインストールを\n" --"成功させるために通常必要です。\n" -+"有効化した Copr リポジトリーの管理者は\n" -+"他のリポジトリーに依存するように決めました。\n" -+"そのようなリポジトリーは通常、主な Corp レジストリー(ランタイム依存関係を提" -+"供) から RPM を\n" -+"正常にインストールするために必要です。\n" - "\n" --"上記の品質とバグ報告についての注意点が\n" --"ここでも適用されますが、Fedora Project は内容を\n" --"管理していないことに注意してください。以下のリストを確認\n" --"してください。\n" -+"上記の品質とバグ報告についての注意点がここでも適用\n" -+"されますが、Fedora Project は内容を管理していないことに\n" -+"注意してください。以下のリストを確認してください。\n" - "\n" - "{0}\n" - "\n" --"これらのリポジトリは自動的に有効になっています。" -+"これらのリポジトリーは自動的に有効になっています。" - --#: plugins/copr.py:574 -+#: plugins/copr.py:576 - msgid "Do you want to keep them enabled?" - msgstr "有効にしておきますか？" - --#: plugins/copr.py:607 -+#: plugins/copr.py:609 - #, python-brace-format - msgid "Failed to remove copr repo {0}/{1}/{2}" - msgstr "copr repo {0}/{1}/{2} の削除に失敗しました" - --#: plugins/copr.py:618 -+#: plugins/copr.py:620 - msgid "Failed to disable copr repo {}/{}" - msgstr "copr repo {}/{} の無効化に失敗しました" - --#: plugins/copr.py:636 plugins/copr.py:673 -+#: plugins/copr.py:638 plugins/copr.py:675 - msgid "Unknown response from server." - msgstr "サーバーからの不明な応答です。" - --#: plugins/copr.py:658 -+#: plugins/copr.py:660 - msgid "Interact with Playground repository." - msgstr "Playground リポジトリーとの対話。" - --#: plugins/copr.py:664 -+#: plugins/copr.py:666 - msgid "Enabling a Playground repository." - msgstr "Playgroundのリポジトリーの有効化。" - --#: plugins/copr.py:665 -+#: plugins/copr.py:667 - msgid "Do you want to continue?" - msgstr "続行しますか？" - --#: plugins/copr.py:709 -+#: plugins/copr.py:711 - msgid "Playground repositories successfully enabled." - msgstr "Playground リポジトリーが正常に有効化されました。" - --#: plugins/copr.py:712 -+#: plugins/copr.py:714 - msgid "Playground repositories successfully disabled." - msgstr "Playground リポジトリーが正常に無効化されました。" - --#: plugins/copr.py:716 -+#: plugins/copr.py:718 - msgid "Playground repositories successfully updated." - msgstr "Playground リポジトリーが正常に更新されました。" - -@@ -552,7 +569,9 @@ msgstr "記録されたパッケージの最新バージョンをインストー - msgid "" - "Ignore architecture and install missing packages matching the name, epoch, " - "version and release." --msgstr "アーキテクチャーを無視し、名前、エポック、バージョン、およびリリースと一致する不足のパッケージをインストールします。" -+msgstr "" -+"アーキテクチャーを無視し、名前、エポック、バージョン、およびリリースと一致す" -+"る不足のパッケージをインストールします。" - - #: plugins/debug.py:196 - msgid "limit to specified type" -@@ -562,7 +581,9 @@ msgstr "指定したタイプに限定します" - msgid "" - "Allow removing of install-only packages. Using this option may result in an " - "attempt to remove the running kernel." --msgstr "インストールのみのパッケージの削除を許可します。このオプションを使用すると、実行しているカーネルの削除を試みる可能性があります。" -+msgstr "" -+"インストールのみのパッケージの削除を許可します。このオプションを使用すると、" -+"実行しているカーネルの削除を試みる可能性があります。" - - #: plugins/debug.py:202 - msgid "name of dump file" -@@ -586,25 +607,31 @@ msgstr "debuginfo パッケージのインストール" - #, python-format - msgid "" - "Could not find debuginfo package for the following available packages: %s" --msgstr "次の利用可能なパッケージの debuginfo パッケージが見つかりませんでした: %s" -+msgstr "" -+"次の利用可能なパッケージの debuginfo パッケージが見つかりませんでした: %s" - - #: plugins/debuginfo-install.py:185 - #, python-format - msgid "" - "Could not find debugsource package for the following available packages: %s" --msgstr "次の利用可能なパッケージの debugsource パッケージが見つかりませんでした: %s" -+msgstr "" -+"次の利用可能なパッケージの debugsource パッケージが見つかりませんでした: %s" - - #: plugins/debuginfo-install.py:190 - #, python-format - msgid "" - "Could not find debuginfo package for the following installed packages: %s" --msgstr "次のインストールされたパッケージの debuginfo パッケージが見つかりませんでした: %s" -+msgstr "" -+"次のインストールされたパッケージの debuginfo パッケージが見つかりませんでし" -+"た: %s" - - #: plugins/debuginfo-install.py:195 - #, python-format - msgid "" - "Could not find debugsource package for the following installed packages: %s" --msgstr "次のインストールされたパッケージの debugsource パッケージが見つかりませんでした: %s" -+msgstr "" -+"次のインストールされたパッケージの debugsource パッケージが見つかりませんでし" -+"た: %s" - - #: plugins/debuginfo-install.py:199 - msgid "Unable to find a match" -@@ -642,12 +669,15 @@ msgstr "必要な依存関係を解決し、ダウンロードします" - msgid "" - "when running with --resolve, download all dependencies (do not exclude " - "already installed ones)" --msgstr "--resolve で実行する場合、すべての依存関係をダウンロードします (インストール済みのものを除外しないでください)" -+msgstr "" -+"--resolve で実行する場合、すべての依存関係をダウンロードします (インストール" -+"済みのものを除外しないでください)" - - #: plugins/download.py:67 - msgid "" - "print list of urls where the rpms can be downloaded instead of downloading" --msgstr "ダウンロードする代わりに、rpm をダウンロードできる url の一覧を印刷します" -+msgstr "" -+"ダウンロードする代わりに、rpm をダウンロードできる url の一覧を印刷します" - - #: plugins/download.py:72 - msgid "when running with --url, limit to specific protocols" -@@ -690,7 +720,9 @@ msgstr "翻訳されたデータの無効または空な言語" - - #: plugins/groups_manager.py:71 - msgid "Can't generate group id from '{}'. Please specify group id using --id." --msgstr "'{}' からグループ ID を生成できません。--id を使用してグループ ID を指定してください。" -+msgstr "" -+"'{}' からグループ ID を生成できません。--id を使用してグループ ID を指定して" -+"ください。" - - #: plugins/groups_manager.py:79 - msgid "create and edit groups metadata file" -@@ -766,7 +798,8 @@ msgstr "パッケージ仕様" - - #: plugins/groups_manager.py:156 - msgid "Can't edit group without specifying it (use --id or --name)" --msgstr "指定せずにはグループを編集できません (--id または --name を使用してください)" -+msgstr "" -+"指定せずにはグループを編集できません (--id または --name を使用してください)" - - #: plugins/groups_manager.py:190 - msgid "Can't load file \"{}\": {}" -@@ -786,13 +819,16 @@ msgstr "存在しないグループからパッケージを削除できません - - #: plugins/groups_manager.py:307 - msgid "" --"Group id '{}' generated from '{}' is duplicit. Please specify group id using" --" --id." --msgstr "'{}' から生成されたグループ ID '{}' は重複しています。--id を使用してグループ ID を指定してください。" -+"Group id '{}' generated from '{}' is duplicit. Please specify group id using " -+"--id." -+msgstr "" -+"'{}' から生成されたグループ ID '{}' は重複しています。--id を使用してグルー" -+"プ ID を指定してください。" - - #: plugins/leaves.py:32 - msgid "List installed packages not required by any other package" --msgstr "他のパッケージから必要とされないインスール済みパッケージを一覧表示します" -+msgstr "" -+"他のパッケージから必要とされないインスール済みパッケージを一覧表示します" - - #: plugins/local.py:122 - msgid "Unable to create a directory '{}' due to '{}'" -@@ -825,67 +861,61 @@ msgstr "履歴データを移行中..." - #: plugins/modulesync.py:37 - msgid "" - "Download packages from modules and/or create a repository with modular data" --msgstr "" -+msgstr "モジュールからパッケージをダウンロードしたり、モジュラーデータでリポジトリー" -+"を作成したりします" - - #: plugins/modulesync.py:44 - msgid "MODULE" --msgstr "" -+msgstr "MODULE" - - #: plugins/modulesync.py:45 --#, fuzzy --#| msgid "packages to download" - msgid "modules to download" --msgstr "ダウンロードするパッケージ" -+msgstr "ダウンロードするモジュール" - - #: plugins/modulesync.py:47 --#, fuzzy --#| msgid "Specify repositories to check" - msgid "enable repositories with source packages" --msgstr "確認するリポジトリーを指定します" -+msgstr "ソースパッケージを含むリポジトリーを有効にします" - - #: plugins/modulesync.py:49 - msgid "enable repositories with debug-info and debug-source packages" --msgstr "" -+msgstr "debug-info パッケージおよび debug-source " -+"パッケージでリポジトリーを有効にします" - - #: plugins/modulesync.py:53 --#, fuzzy --#| msgid "download all packages from remote repo" - msgid "download only packages from newest modules" --msgstr "リモート repo からすべてのパッケージをダウンロードします" -+msgstr "最新のモジュールからパッケージのみをダウンロードします" - - #: plugins/modulesync.py:85 --#, fuzzy --#| msgid "No match for argument: {}" - msgid "Unable to find a match for argument: '{}'" - msgid_plural "Unable to find a match for arguments: '{}'" --msgstr[0] "一致した引数がありません: {}" -+msgstr[0] "引数に一致するものが見つかりませんでした: '{}'" - - #: plugins/modulesync.py:107 - msgid "" - "Creation of repository failed with return code {}. All downloaded content " - "was kept on the system" --msgstr "" -+msgstr "リポジトリーの作成は戻りコード {} " -+"で失敗しました。ダウンロードされたコンテンツはすべてシステムに保持されました" - - #: plugins/modulesync.py:144 - #, python-brace-format - msgid "No match for artifact '{0}' from module '{1}'" --msgstr "" -+msgstr "モジュール '{1}' のアーティファクト '{0}' に一致するものはありません" - - #: plugins/modulesync.py:162 - #, python-brace-format - msgid "No match for package name '{0}' in profile {1} from module {2}" --msgstr "" -+msgstr "モジュール {2} からのプロファイル {1} のパッケージ名 '{0}' " -+"に一致するものはありません" - - #: plugins/modulesync.py:166 --#, fuzzy --#| msgid "No match for argument: {}" - msgid "No mach for argument '{}'" --msgstr "一致した引数がありません: {}" -+msgstr "引数 '{}' に一致するものはありません" - - #. TODO(jmracek) Shell we end with an error or with RC 1? - #: plugins/modulesync.py:198 - msgid "Unable to satisfy require {}" --msgstr "" -+msgstr "要求 {} を満たすことができません" - - #: plugins/needs_restarting.py:66 - #, python-brace-format -@@ -893,8 +923,8 @@ msgid "" - "No installed package found for package name \"{pkg}\" specified in needs-" - "restarting file \"{file}\"." - msgstr "" --"needs-restarting ファイル \"{file}\" に指定されている {pkg} " --"というパッケージのインストール済みパッケージが見つかりません。" -+"needs-restarting ファイル \"{file}\" に指定されている \"{pkg}\" というパッ" -+"ケージのインストール済みパッケージが見つかりません。" - - #: plugins/needs_restarting.py:220 - msgid "determine updated binaries that need restarting" -@@ -907,7 +937,8 @@ msgstr "このユーザーのプロセスのみを検討します" - #: plugins/needs_restarting.py:227 - msgid "" - "only report whether a reboot is required (exit code 1) or not (exit code 0)" --msgstr "再起動が必要か (終了コード 1) 必要でないか (終了コード 0) のみを報告します" -+msgstr "" -+"再起動が必要か (終了コード 1) 必要でないか (終了コード 0) のみを報告します" - - #: plugins/needs_restarting.py:230 - msgid "only report affected systemd services" -@@ -927,7 +958,8 @@ msgstr "詳細情報:" - - #: plugins/needs_restarting.py:263 - msgid "No core libraries or services have been updated since boot-up." --msgstr "起動以降にアップデートされたコアライブラリーまたはサービスはありません。" -+msgstr "" -+"起動以降にアップデートされたコアライブラリーまたはサービスはありません。" - - #: plugins/needs_restarting.py:265 - msgid "Reboot should not be necessary." -@@ -959,23 +991,23 @@ msgstr "post-transaction-actions: 不正なコマンド \"%s\": %s" - msgid "Display a list of unresolved dependencies for repositories" - msgstr "リポジトリーの未解決の依存関係の一覧を表示します" - --#: plugins/repoclosure.py:66 --msgid "Repoclosure ended with unresolved dependencies." --msgstr "repoclosure は未解決の依存関係で終了しました。" -+#: plugins/repoclosure.py:69 -+msgid "Repoclosure ended with unresolved dependencies ({}) across {} packages." -+msgstr "Repoclosure は、{} パッケージで依存関係 ({}) が解決されずに終了します。" - --#: plugins/repoclosure.py:153 -+#: plugins/repoclosure.py:159 - msgid "check packages of the given archs, can be specified multiple times" - msgstr "特定の arch のパッケージを確認します。複数回指定することができます" - --#: plugins/repoclosure.py:156 -+#: plugins/repoclosure.py:162 - msgid "Specify repositories to check" - msgstr "確認するリポジトリーを指定します" - --#: plugins/repoclosure.py:158 -+#: plugins/repoclosure.py:164 - msgid "Check only the newest packages in the repos" - msgstr "repo の最新パッケージのみを確認します" - --#: plugins/repoclosure.py:161 -+#: plugins/repoclosure.py:167 - msgid "Check closure for this package only" - msgstr "このパッケージのみのクロージャーを確認します" - -@@ -995,7 +1027,9 @@ msgstr "新しいリポジトリーを指定します、これは複数回使用 - msgid "" - "Specify architectures to compare, can be used multiple times. By default, " - "only source rpms are compared." --msgstr "比較するアーキテクチャーを指定します、これは複数回使用できます。デフォルトで、ソース rpms のみが比較されます。" -+msgstr "" -+"比較するアーキテクチャーを指定します、これは複数回使用できます。デフォルト" -+"で、ソース rpms のみが比較されます。" - - #: plugins/repodiff.py:67 - msgid "Output additional data about the size of the changes." -@@ -1003,9 +1037,10 @@ msgstr "変更サイズに関する追加データを出力します。" - - #: plugins/repodiff.py:69 - msgid "" --"Compare packages also by arch. By default packages are compared just by " --"name." --msgstr "パッケージを Arch でも比較します。デフォルトで、パッケージは名前のみで比較されます。" -+"Compare packages also by arch. By default packages are compared just by name." -+msgstr "" -+"パッケージを Arch でも比較します。デフォルトで、パッケージは名前のみで比較さ" -+"れます。" - - #: plugins/repodiff.py:72 - msgid "Output a simple one line message for modified packages." -@@ -1015,7 +1050,9 @@ msgstr "変更されたパッケージに簡単な 1 行メッセージを出力 - msgid "" - "Split the data for modified packages between upgraded and downgraded " - "packages." --msgstr "アップグレードされたパッケージとダウングレードされたパッケージとの間で、変更されたパッケージのデータを分割します。" -+msgstr "" -+"アップグレードされたパッケージとダウングレードされたパッケージとの間で、変更" -+"されたパッケージのデータを分割します。" - - #: plugins/repodiff.py:86 - msgid "Both old and new repositories must be set." -@@ -1128,7 +1165,7 @@ msgstr "rpm パッケージのディレクトリーを管理します" - - #: plugins/repomanage.py:59 - msgid "Pass either --old or --new, not both!" --msgstr "--old または --new のいずれかを渡します。両方ではありません。" -+msgstr "--old または --new のいずれかを渡します、両方ではありません!" - - #: plugins/repomanage.py:89 - msgid "No files to process" -@@ -1184,9 +1221,11 @@ msgstr "comps.xml もダウンロードして展開します" - - #: plugins/reposync.py:75 - msgid "" --"where to store downloaded repository metadata. Defaults to the value of " --"--download-path." --msgstr "ダウンロード済みリポジトリーメタデータの保管場所。初期値は --download-path です。" -+"where to store downloaded repository metadata. Defaults to the value of --" -+"download-path." -+msgstr "" -+"ダウンロード済みリポジトリーメタデータの保管場所。初期値は --download-path で" -+"す。" - - #: plugins/reposync.py:78 - msgid "download only newest packages per-repo" -@@ -1210,7 +1249,9 @@ msgstr "ソースパッケージのみをダウンロード" - - #: plugins/reposync.py:89 - msgid "Just list urls of what would be downloaded, don't download" --msgstr "ダウンロードする予定のものの URL をリストするだけで、ダウンロードしないでください" -+msgstr "" -+"ダウンロードする予定のものの URL をリストするだけで、ダウンロードしないでくだ" -+"さい" - - #: plugins/reposync.py:113 - msgid "Can't use --norepopath with multiple repositories" -@@ -1254,7 +1295,8 @@ msgstr "リポジトリー %s の comps.xml が保存されました" - - #: plugins/show_leaves.py:54 - msgid "New leaves:" --msgstr "新規のリーフパッケージ (他のパッケージから依存されていないパッケージ) :" -+msgstr "" -+"新規のリーフパッケージ (他のパッケージから依存されていないパッケージ) :" - - #: plugins/versionlock.py:33 - #, python-format -@@ -1302,7 +1344,8 @@ msgid "Versionlock plugin: number of lock rules from file \"{}\" applied: {}" - msgstr "versionlock プラグイン: ファイル \"{}\" のロックルールの数を適用: {}" - - #: plugins/versionlock.py:44 --msgid "Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" -+msgid "" -+"Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" - msgstr "versionlock プラグイン: ファイル \"{}\" の除外ルールの数を適用: {}" - - #: plugins/versionlock.py:45 -@@ -1319,11 +1362,14 @@ msgstr "パッケージ仕様をそのまま使用し、解析を試みないで - - #: plugins/versionlock.py:164 - msgid "Subcommand '{}' is deprecated. Use 'exclude' subcommand instead." --msgstr "サブコマンド '{}' は非推奨になりました。代わりに 'exclude' サブコマンドを使用してください。" -+msgstr "" -+"サブコマンド '{}' は非推奨になりました。代わりに 'exclude' サブコマンドを使用" -+"してください。" - - #~ msgid "" - #~ "This repository does not have any builds yet so you cannot enable it now." --#~ msgstr "このリポジトリーにはまだビルドがありませんので、今すぐ有効化できません。" -+#~ msgstr "" -+#~ "このリポジトリーにはまだビルドがありませんので、今すぐ有効化できません。" - - #~ msgid "" - #~ "\n" -diff --git a/po/ko.po b/po/ko.po -index 726adb5..46f9bf8 100644 ---- a/po/ko.po -+++ b/po/ko.po -@@ -1,20 +1,22 @@ - # Ludek Janda , 2018. #zanata, 2020. --# Marek Blaha , 2020. - # simmon , 2021. -+# Kim InSoo , 2022. -+# 김인수 , 2022. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2022-01-11 01:55+0000\n" --"PO-Revision-Date: 2021-09-04 17:04+0000\n" --"Last-Translator: simmon \n" --"Language-Team: Korean \n" -+"POT-Creation-Date: 2022-08-31 13:39+0200\n" -+"PO-Revision-Date: 2022-09-02 02:19+0000\n" -+"Last-Translator: 김인수 \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: Weblate 4.8\n" -+"X-Generator: Weblate 4.14\n" - - #: plugins/builddep.py:45 - msgid "[PACKAGE|PACKAGE.spec]" -@@ -27,7 +29,7 @@ msgstr "'%s'는 'MACRO EXPR' 형식이 아닙니다" - - #: plugins/builddep.py:90 - msgid "packages with builddeps to install" --msgstr "설치 할 builddeps가 있는 꾸러미(package)" -+msgstr "설치 할 builddeps가 있는 꾸러미" - - #: plugins/builddep.py:93 - msgid "define a macro for spec file parsing" -@@ -43,7 +45,7 @@ msgstr "명령줄 인수를 지정한 파일로 다룬다" - - #: plugins/builddep.py:100 - msgid "treat commandline arguments as source rpm" --msgstr "명령줄 인수를 rpm 소스로 다룬다" -+msgstr "원천 rpm으로 명령줄 인수를 다룬다" - - #: plugins/builddep.py:144 - msgid "RPM: {}" -@@ -51,15 +53,14 @@ msgstr "RPM: {}" - - #: plugins/builddep.py:153 - msgid "Some packages could not be found." --msgstr "몇몇 꾸러미(packages)를 찾을 수 없습니다." -+msgstr "몇몇 꾸러미를 찾을 수 없습니다." - - #. No provides, no files --#. Richdeps can have no matches but it could be correct (solver must decide --#. later) -+#. Richdeps can have no matches but it could be correct (solver must decide later) - #: plugins/builddep.py:173 - #, python-format - msgid "No matching package to install: '%s'" --msgstr "설치: '%s' 꾸러미(package)가 일치하지 않습니다" -+msgstr "설치: '%s' 꾸러미가 일치하지 않습니다" - - #: plugins/builddep.py:191 - #, python-format -@@ -75,39 +76,43 @@ msgstr "모든 의존성을 만족하지 않습니다" - msgid "Failed to open: '%s', not a valid spec file: %s" - msgstr "여는데 실패하였습니다 '%s', 지정한 파일: %s가 유효하지 않습니다" - --#: plugins/builddep.py:230 plugins/repoclosure.py:118 -+#: plugins/builddep.py:230 plugins/repoclosure.py:124 - #, python-format - msgid "no package matched: %s" --msgstr "일치하는 꾸러미(package) 없음: %s" -+msgstr "일치하는 꾸러미 없음: %s" - - #: plugins/changelog.py:37 - #, python-brace-format - msgid "Not a valid date: \"{0}\"." --msgstr "유효한 날자가 아닙니다: \"{0}\"." -+msgstr "유효한 날짜가 아닙니다: \"{0}\"." - - #: plugins/changelog.py:43 - msgid "Show changelog data of packages" --msgstr "꾸러미(packages)의 변화 기록자료를 보여줍니다" -+msgstr "꾸러미의 변화 기록자료를 보여줍니다" - - #: plugins/changelog.py:51 - msgid "" - "show changelog entries since DATE. To avoid ambiguosity, YYYY-MM-DD format " - "is recommended." --msgstr "DATE 이후에 변화기록를 보여줍니다. 모호함을 피하기 위하여, YYYY-MM-DD 형식을 추천합니다." -+msgstr "" -+"DATE 이후에 변화기록를 보여줍니다. 모호함을 피하기 위하여, YYYY-MM-DD 형식을 " -+"추천합니다." - - #: plugins/changelog.py:55 - msgid "show given number of changelog entries per package" --msgstr "주어진 수의 꾸러미(package) 마다 변화기록 항목을 보여줍니다" -+msgstr "주어진 수의 꾸러미 마다 변화기록 항목을 보여줍니다" - - #: plugins/changelog.py:58 - msgid "" - "show only new changelog entries for packages, that provide an upgrade for " - "some of already installed packages." --msgstr "몇몇 이미 설치된 꾸러미(package)들의 최신화를 제공하는 꾸러미를 위하여 새로운 변화기록만을 보여줍니다." -+msgstr "" -+"몇몇 이미 설치된 꾸러미들의 최신화를 제공하는 꾸러미를 위하여 새로운 변화기록" -+"만을 보여줍니다." - - #: plugins/changelog.py:60 - msgid "PACKAGE" --msgstr "꾸러미(package)" -+msgstr "꾸러미" - - #: plugins/changelog.py:81 plugins/debuginfo-install.py:90 - #, python-format -@@ -142,7 +147,7 @@ msgstr "{prog} 환경 선택과 저장소 관리" - - #: plugins/config_manager.py:45 - msgid "repo to modify" --msgstr "수정할 repo" -+msgstr "수정하려는 저장소" - - #: plugins/config_manager.py:48 - msgid "save the current options (useful with --setopt)" -@@ -177,8 +182,8 @@ msgid "" - "Warning: --enablerepo/--disablerepo arguments have no meaningwith config " - "manager. Use --set-enabled/--set-disabled instead." - msgstr "" --"경고: -- --enablerepo/--disablerepo 인수는 설정 관리자와 함께 의미를 갖고 있지 않습니다. 대신에 --set-" --"enabled/--set-disabled를 사용하세요." -+"경고: -- --enablerepo/--disablerepo 인수는 설정 관리자와 함께 의미를 갖고 있" -+"지 않습니다. 대신에 --set-enabled/--set-disabled를 사용하세요." - - #: plugins/config_manager.py:132 - #, python-format -@@ -278,45 +283,47 @@ msgstr "사용자가 사용할 수있는 Copr 저장소를 나열합니다. NAME - msgid "Specify an instance of Copr to work with" - msgstr "일하는 Copr의 예를 지정합니다" - --#: plugins/copr.py:164 plugins/copr.py:232 plugins/copr.py:259 -+#: plugins/copr.py:164 plugins/copr.py:236 plugins/copr.py:263 - msgid "Error: " - msgstr "오류: " - - #: plugins/copr.py:165 - msgid "" --"specify Copr hub either with `--hub` or using " --"`copr_hub/copr_username/copr_projectname` format" -+"specify Copr hub either with `--hub` or using `copr_hub/copr_username/" -+"copr_projectname` format" - msgstr "" --"Corp hub를 `--hub` 또는 사용하기 `copr_hub/copr_username/copr_projectname`형식으로 " --"지정합니다" -+"Corp hub를 `--hub` 또는 사용하기 `copr_hub/copr_username/copr_projectname`형" -+"식으로 지정합니다" - - #: plugins/copr.py:168 - msgid "multiple hubs specified" - msgstr "지정된 여러 허브" - --#: plugins/copr.py:233 plugins/copr.py:237 -+#: plugins/copr.py:237 plugins/copr.py:241 - msgid "exactly two additional parameters to copr command are required" - msgstr "copr 명령에 정확히 두 개의 추가 매개 변수가 필요합니다" - --#: plugins/copr.py:242 -+#: plugins/copr.py:246 - msgid "Too many arguments." - msgstr "너무 많은 인수." - --#: plugins/copr.py:245 -+#: plugins/copr.py:249 - msgid "" - "Bad format of optional chroot. The format is distribution-version-" - "architecture." - msgstr "선택적인 chroot의 나쁜 형식. 형식은 배포-버전-구조입니다." - --#: plugins/copr.py:260 -+#: plugins/copr.py:264 - msgid "use format `copr_username/copr_projectname` to reference copr project" --msgstr "copr 프로젝트를 참조하기 위해`copr_username / copr_projectname` 형식을 사용하십시오" -+msgstr "" -+"copr 프로젝트를 참조하기 위해`copr_username / copr_projectname` 형식을 사용하" -+"십시오" - --#: plugins/copr.py:262 -+#: plugins/copr.py:266 - msgid "bad copr project format" - msgstr "나쁜 copr 프로젝트 형식" - --#: plugins/copr.py:276 -+#: plugins/copr.py:280 - msgid "" - "\n" - "Enabling a Copr repository. Please note that this repository is not part\n" -@@ -324,107 +331,108 @@ msgid "" - "\n" - "The Fedora Project does not exercise any power over the contents of\n" - "this repository beyond the rules outlined in the Copr FAQ at\n" --",\n" -+",\n" - "and packages are not held to any quality or security level.\n" - "\n" - "Please do not file bug reports about these packages in Fedora\n" - "Bugzilla. In case of problems, contact the owner of this repository.\n" - msgstr "" - "\n" --"Core 저정소를 활성화합니다. 이 저장소는 주요 배포판 부분이 아님을 알고 있기 바라고,\n" -+"Core 저정소를 활성화합니다. 이 저장소는 주요 배포판 부분이 아님을 알고 있기 " -+"바라고,\n" - "품질이 다를 수 있습니다.\n" - "\n" - "페도라 프로젝트는\n" --"에\n" --"Core FAQ에 있는 설명된 규칙을 넘는 저장소 내용 이상의 권한을 시험하지 않으며,\n" -+"에\n" -+"Core FAQ에 있는 설명된 규칙을 넘는 저장소 내용 이상의 권한을 시험하지 않으" -+"며,\n" - "그리고 꾸러미(package)는 어떤 품질이나 보안 수준을 유지하지 않습니다.\n" - "\n" - "페도라 버그질라에 이들 꾸러미에 대한 파일 결점 보고를 제출하지 마세요.\n" - "이들 문제는, 이들 저장소 소유자와 접촉하세요.\n" - --#: plugins/copr.py:293 -+#: plugins/copr.py:297 - msgid "Repository successfully enabled." - msgstr "저장소가 사용 설정되었습니다." - --#: plugins/copr.py:298 -+#: plugins/copr.py:302 - msgid "Repository successfully disabled." - msgstr "저장소가 사용 중지되었습니다." - --#: plugins/copr.py:302 -+#: plugins/copr.py:306 - msgid "Repository successfully removed." - msgstr "저장소가 제거되었습니다." - --#: plugins/copr.py:306 plugins/copr.py:719 -+#: plugins/copr.py:310 plugins/copr.py:721 - msgid "Unknown subcommand {}." - msgstr "알 수없는 부속 명령 {}." - --#: plugins/copr.py:363 -+#: plugins/copr.py:367 - msgid "" --"* These coprs have repo file with an old format that contains no information" --" about Copr hub - the default one was assumed. Re-enable the project to fix " -+"* These coprs have repo file with an old format that contains no information " -+"about Copr hub - the default one was assumed. Re-enable the project to fix " - "this." - msgstr "" --"* 이들 coprs은 Copr hub에 대하여 어떤 정보도 포함하지 않는 오래된 형태의 저장소 파일을 갖고 있습니다. 이 문제를 수정하기" --" 위하여 프로젝트를 재활성화하세요." -+"* 이들 coprs은 Copr hub에 대하여 어떤 정보도 포함하지 않는 오래된 형태의 저장" -+"소 파일을 갖고 있습니다. 이 문제를 수정하기 위하여 프로젝트를 재활성화하세요." - --#: plugins/copr.py:376 -+#: plugins/copr.py:380 - msgid "Can't parse repositories for username '{}'." - msgstr "사용자 이름 '{}'에 대한 리포지토리를 구문 분석 할 수 없습니다." - --#: plugins/copr.py:379 -+#: plugins/copr.py:383 - msgid "List of {} coprs" - msgstr "{} 명의 경찰 목록" - --#: plugins/copr.py:384 -+#: plugins/copr.py:388 - msgid "No description given" - msgstr "설명이 없습니다" - --#: plugins/copr.py:396 -+#: plugins/copr.py:400 - msgid "Can't parse search for '{}'." - msgstr "'{}'에 대한 검색을 구문 분석 할 수 없습니다." - --#: plugins/copr.py:399 -+#: plugins/copr.py:403 - msgid "Matched: {}" - msgstr "일치하는 항목 : {}" - --#: plugins/copr.py:404 -+#: plugins/copr.py:408 - msgid "No description given." - msgstr "설명이 없습니다." - --#: plugins/copr.py:426 -+#: plugins/copr.py:430 - msgid "Safe and good answer. Exiting." - msgstr "안전하고 좋은 대답. 나가기." - --#: plugins/copr.py:433 -+#: plugins/copr.py:437 - msgid "This command has to be run under the root user." - msgstr "이 명령은 루트 사용자로 실행해야합니다." - --#: plugins/copr.py:485 -+#: plugins/copr.py:487 - #, python-brace-format - msgid "Request to {0} failed: {1} - {2}" --msgstr "" -+msgstr "{0}에 대한 요청이 실패함: {1} - {2}" - --#: plugins/copr.py:487 -+#: plugins/copr.py:489 - msgid "It wasn't possible to enable this project.\n" --msgstr "" -+msgstr "이와 같은 프로젝트를 활성화 할 수 없습니다.\n" - --#: plugins/copr.py:492 --#, fuzzy, python-brace-format --#| msgid "Such repository does not exist." -+#: plugins/copr.py:494 -+#, python-brace-format - msgid "Repository '{0}' does not exist in project '{1}'." --msgstr "이러한 저장소는 존재하지 않습니다." -+msgstr "저장소 '{0}'는 프로젝트 '{1}'에 존재하지 않습니다." - --#: plugins/copr.py:495 --#, fuzzy --#| msgid "List enabled Copr repositories" -+#: plugins/copr.py:497 - msgid "" - "\n" - "Available repositories: " - msgstr "" - "\n" --"사용 가능한 Copr 저장소 목록 " -+"사용 가능한 저장소: " - --#: plugins/copr.py:497 -+#: plugins/copr.py:499 - #, python-brace-format - msgid "" - "\n" -@@ -433,20 +441,25 @@ msgid "" - " 'dnf copr enable {0} '\n" - "But note that the installed repo file will likely need a manual modification." - msgstr "" -+"\n" -+"\n" -+"만약 기본설정되지 않은 저장소를 활성화 하고자 한다면, 다음 명령을 사용하세요:" -+" \n" -+" 'dnf copr enable {0} ' \n" -+"하지만 설치된 저장소 파일은 수동으로 수정해야 할 필요가 있다는 점을 " -+"참고하세요." - --#: plugins/copr.py:503 --#, fuzzy, python-brace-format --#| msgid "Such repository does not exist." -+#: plugins/copr.py:505 -+#, python-brace-format - msgid "Project {0} does not exist." --msgstr "이러한 저장소는 존재하지 않습니다." -+msgstr "프로젝트 {0}가 존재하지 않습니다." - --#: plugins/copr.py:506 --#, fuzzy, python-brace-format --#| msgid "Failed to remove copr repo {0}/{1}/{2}" -+#: plugins/copr.py:508 -+#, python-brace-format - msgid "Failed to connect to {0}: {1}" --msgstr "copr repo {0}/{1}/{2} 제거를 실패하였습니다" -+msgstr "연결 하는데 실패함 {0}: {1}" - --#: plugins/copr.py:553 -+#: plugins/copr.py:555 - #, python-brace-format - msgid "" - "Maintainer of the enabled Copr repository decided to make\n" -@@ -475,50 +488,50 @@ msgstr "" - "\n" - "이들 저장소는 자동으로 활성화 됩니다." - --#: plugins/copr.py:574 -+#: plugins/copr.py:576 - msgid "Do you want to keep them enabled?" - msgstr "계속 사용하길 원하시나요?" - --#: plugins/copr.py:607 -+#: plugins/copr.py:609 - #, python-brace-format - msgid "Failed to remove copr repo {0}/{1}/{2}" - msgstr "copr repo {0}/{1}/{2} 제거를 실패하였습니다" - --#: plugins/copr.py:618 -+#: plugins/copr.py:620 - msgid "Failed to disable copr repo {}/{}" - msgstr "copr repo {} / {}를 사용 중지를 실패하였습니다" - --#: plugins/copr.py:636 plugins/copr.py:673 -+#: plugins/copr.py:638 plugins/copr.py:675 - msgid "Unknown response from server." - msgstr "서버에서 알 수없는 응답." - --#: plugins/copr.py:658 -+#: plugins/copr.py:660 - msgid "Interact with Playground repository." - msgstr "놀이터 저장소와 상호 작용하십시오." - --#: plugins/copr.py:664 -+#: plugins/copr.py:666 - msgid "Enabling a Playground repository." - msgstr "동작 저장소와 활용하기." - --#: plugins/copr.py:665 -+#: plugins/copr.py:667 - msgid "Do you want to continue?" - msgstr "계속하기를 원하십니까?" - --#: plugins/copr.py:709 -+#: plugins/copr.py:711 - msgid "Playground repositories successfully enabled." - msgstr "놀이터 저장소를 사용하도록 설정했습니다." - --#: plugins/copr.py:712 -+#: plugins/copr.py:714 - msgid "Playground repositories successfully disabled." - msgstr "놀이터 저장소가 사용 중지되었습니다." - --#: plugins/copr.py:716 -+#: plugins/copr.py:718 - msgid "Playground repositories successfully updated." - msgstr "놀이터 저장소가 성공적으로 업데이트되었습니다." - - #: plugins/debug.py:53 - msgid "dump information about installed rpm packages to file" --msgstr "설치된 rpm 꾸러미(package)에 대한 정보를 파일에 덤프하십시오" -+msgstr "설치된 rpm 꾸러미에 대한 정보를 파일에 덤프하세요" - - #: plugins/debug.py:67 - msgid "do not attempt to dump the repository contents." -@@ -535,7 +548,7 @@ msgstr "작성된 출력 : %s" - - #: plugins/debug.py:172 - msgid "restore packages recorded in debug-dump file" --msgstr "디버그 덤프 파일에 기록 된 꾸러미(package) 복원" -+msgstr "디버그 덤프 파일에 기록 된 꾸러미 복원" - - #: plugins/debug.py:185 - msgid "output commands that would be run to stdout." -@@ -549,7 +562,9 @@ msgstr "기록 된 꾸러미의 최신 버전을 설치하십시오." - msgid "" - "Ignore architecture and install missing packages matching the name, epoch, " - "version and release." --msgstr "구조를 무시하고 이름, 기원, 버전및 출시와 일치하는 누락 된 꾸러미를 설치하십시오." -+msgstr "" -+"구조를 무시하고 이름, 기원, 버전및 출시와 일치하는 누락 된 꾸러미를 설치하십" -+"시오." - - #: plugins/debug.py:196 - msgid "limit to specified type" -@@ -559,7 +574,9 @@ msgstr "특정 유형으로 제한" - msgid "" - "Allow removing of install-only packages. Using this option may result in an " - "attempt to remove the running kernel." --msgstr "설치전용 꾸리미 제거를 허용합니다. 이 선택의 사용은 동작하고 있는 커널을 제거하는 결과가 나타날 수 있습니다." -+msgstr "" -+"설치전용 꾸리미 제거를 허용합니다. 이 선택의 사용은 동작하고 있는 커널을 제거" -+"하는 결과가 나타날 수 있습니다." - - #: plugins/debug.py:202 - msgid "name of dump file" -@@ -568,7 +585,7 @@ msgstr "덤프 파일의 이름" - #: plugins/debug.py:273 - #, python-format - msgid "Package %s is not available" --msgstr "꾸러미(package) %s 사용 할 수 없습니다" -+msgstr "꾸러미 %s를 사용 할 수 없습니다" - - #: plugins/debug.py:283 - #, python-format -@@ -577,31 +594,32 @@ msgstr "잘못된 dnf 디버그 파일 : %s" - - #: plugins/debuginfo-install.py:56 - msgid "install debuginfo packages" --msgstr "디버그정보 꾸러미(package) 설치" -+msgstr "디버그정보 꾸러미 설치" - - #: plugins/debuginfo-install.py:180 - #, python-format - msgid "" - "Could not find debuginfo package for the following available packages: %s" --msgstr "다음 사용가능한 꾸러미(package): %s 를 위하여 디버그정보 꾸러미를 찾을 수 없습니다" -+msgstr "" -+"다음 사용가능한 꾸러미를 위하여 디버그정보 꾸러미를 찾을 수 없습니다: %s" - - #: plugins/debuginfo-install.py:185 - #, python-format - msgid "" - "Could not find debugsource package for the following available packages: %s" --msgstr "다음 가용한 꾸러미(package): %s 를 위하여 디버그자원 꾸러미(package)를 찾을 수 없습니다" -+msgstr "다음 가용한 꾸러미: %s 를 위하여 디버그자원 꾸러미를 찾을 수 없습니다" - - #: plugins/debuginfo-install.py:190 - #, python-format - msgid "" - "Could not find debuginfo package for the following installed packages: %s" --msgstr "다음 설치된 꾸러미(package): %s 를 위한 디버그정보 꾸러미(package)를 찾을 수 없습니다" -+msgstr "다음 설치된 꾸러미를 위한 디버그정보 꾸러미를 찾을 수 없습니다: %s" - - #: plugins/debuginfo-install.py:195 - #, python-format - msgid "" - "Could not find debugsource package for the following installed packages: %s" --msgstr "다음 설치된 꾸러미(package): %s 를 위하여 디버그자원 꾸러미(package)를 찾을 수 없습니다" -+msgstr "다음 설치된 꾸러미: %s 를 위하여 디버그자원 꾸러미를 찾을 수 없습니다" - - #: plugins/debuginfo-install.py:199 - msgid "Unable to find a match" -@@ -621,15 +639,15 @@ msgstr "대신 src.rpm을 내려받으세요" - - #: plugins/download.py:55 - msgid "download the -debuginfo package instead" --msgstr "대신 -debuginfo 꾸러미(package)를 내려받아요" -+msgstr "대신 -debuginfo 꾸러미를 내려받아요" - - #: plugins/download.py:57 - msgid "download the -debugsource package instead" --msgstr "대신 -debuginfo 꾸러미(package)를 내려받으세요" -+msgstr "대신 -debuginfo 꾸러미를 내려받으세요" - - #: plugins/download.py:60 - msgid "limit the query to packages of given architectures." --msgstr "요청를 주어진 구조 꾸러미(package)로 제한하십시오." -+msgstr "요청를 제공된 구조의 꾸러미로 제한합니다." - - #: plugins/download.py:62 plugins/modulesync.py:51 - msgid "resolve and download needed dependencies" -@@ -639,7 +657,9 @@ msgstr "필요한 종속성을 해결하고 내려받아요" - msgid "" - "when running with --resolve, download all dependencies (do not exclude " - "already installed ones)" --msgstr "--resolve 와 함께 실행 할 때에, 모든 의존성을 내려받습니다 (이미 설치된 것들은 포함하지 않습니다)" -+msgstr "" -+"--resolve 와 함께 실행 할 때에, 모든 의존성을 내려받습니다 (이미 설치된 것들" -+"은 포함하지 않습니다)" - - #: plugins/download.py:67 - msgid "" -@@ -661,17 +681,17 @@ msgstr "엄격한 설정으로 인해 종료됩니다." - - #: plugins/download.py:261 - msgid "Error in resolve of packages:" --msgstr "꾸러미(package) 해결 오류 :" -+msgstr "꾸러미 해결 오류 :" - - #: plugins/download.py:279 - #, python-format - msgid "No source rpm defined for %s" --msgstr "소스 rpm이 정의되지 않았습니다. %s" -+msgstr "%s를 위한 원천 rpm이 정의되지 않음" - - #: plugins/download.py:296 plugins/download.py:309 - #, python-format - msgid "No package %s available." --msgstr "가용한 꾸러미(package) %s가 없습니다." -+msgstr "가용한 꾸러미 %s가 없습니다." - - #: plugins/groups_manager.py:49 - msgid "Invalid group id" -@@ -687,7 +707,9 @@ msgstr "번역된 자료가 유효하지 않음/비워짐" - - #: plugins/groups_manager.py:71 - msgid "Can't generate group id from '{}'. Please specify group id using --id." --msgstr "'{}' 에서 그룹 id를 발생 할 수 없습니다. --id를 사용하여 그룹 id를 지정해 주세요." -+msgstr "" -+"'{}' 에서 그룹 id를 발생 할 수 없습니다. --id를 사용하여 그룹 id를 지정해 주" -+"세요." - - #: plugins/groups_manager.py:79 - msgid "create and edit groups metadata file" -@@ -743,23 +765,23 @@ msgstr "그룹 사용자를 보이지 않게 표시" - - #: plugins/groups_manager.py:123 - msgid "add packages to the mandatory section" --msgstr "꾸러미(package)를 필 수 부분에 추가합니다" -+msgstr "꾸러미를 필수 부분에 추가합니다" - - #: plugins/groups_manager.py:125 - msgid "add packages to the optional section" --msgstr "꾸러미(package)를 선택 부분에 추가합니다" -+msgstr "꾸러미를 선택 부분에 추가합니다" - - #: plugins/groups_manager.py:127 - msgid "remove packages from the group instead of adding them" --msgstr "추가하기 대신에 그룹에서 꾸러미(package)를 제거합니다" -+msgstr "추가하기 대신에 그룹에서 꾸러미를 제거합니다" - - #: plugins/groups_manager.py:129 - msgid "include also direct dependencies for packages" --msgstr "꾸러미(package)를 위해 직접적인 의존성을 포함한다" -+msgstr "꾸러미를 위해 직접적인 의존성을 포함한다" - - #: plugins/groups_manager.py:132 - msgid "package specification" --msgstr "꾸러미(package) 사양" -+msgstr "꾸러미 사양" - - #: plugins/groups_manager.py:156 - msgid "Can't edit group without specifying it (use --id or --name)" -@@ -779,17 +801,19 @@ msgstr "일치하는 인수가 없습니다 :{}" - - #: plugins/groups_manager.py:298 - msgid "Can't remove packages from non-existent group" --msgstr "존재하지 않는 그룹에서 꾸러미(package)를 제거 할 수 없습니다" -+msgstr "존재하지 않는 그룹에서 꾸러미를 제거 할 수 없습니다" - - #: plugins/groups_manager.py:307 - msgid "" --"Group id '{}' generated from '{}' is duplicit. Please specify group id using" --" --id." --msgstr "'{}'에서 발생한 그룹 id '{}'는 중복되었습니다. --id를 사용하여 그룹 id를 지정하기 바랍니다." -+"Group id '{}' generated from '{}' is duplicit. Please specify group id using " -+"--id." -+msgstr "" -+"'{}'에서 발생한 그룹 id '{}'는 중복되었습니다. --id를 사용하여 그룹 id를 지정" -+"하기 바랍니다." - - #: plugins/leaves.py:32 - msgid "List installed packages not required by any other package" --msgstr "다른 꾸러미(package)에서 필요하지 않은 설치된 꾸러미(packages) 나열" -+msgstr "다른 꾸러미에서 필요하지 않은 설치된 꾸러미 나열" - - #: plugins/local.py:122 - msgid "Unable to create a directory '{}' due to '{}'" -@@ -822,67 +846,58 @@ msgstr "기록 데이터 마이그레이션 중 ..." - #: plugins/modulesync.py:37 - msgid "" - "Download packages from modules and/or create a repository with modular data" --msgstr "" -+msgstr "모듈에서 꾸러미를 내려 받기와/또는 모듈식 자료를 갖고 있는 저장소를 생성" - - #: plugins/modulesync.py:44 - msgid "MODULE" --msgstr "" -+msgstr "MODULE" - - #: plugins/modulesync.py:45 --#, fuzzy --#| msgid "packages to download" - msgid "modules to download" --msgstr "내려받기 할 꾸러미" -+msgstr "내려받기 할 모듈" - - #: plugins/modulesync.py:47 --#, fuzzy --#| msgid "Specify repositories to check" - msgid "enable repositories with source packages" --msgstr "점검 할 저장소를 지정하세요" -+msgstr "원천 꾸러미로 저장소 활성화" - - #: plugins/modulesync.py:49 - msgid "enable repositories with debug-info and debug-source packages" --msgstr "" -+msgstr "debug-info와 debug-source 꾸러미로 저장소 활성화" - - #: plugins/modulesync.py:53 --#, fuzzy --#| msgid "download all packages from remote repo" - msgid "download only packages from newest modules" --msgstr "원격 저장소에서 모든 꾸러미(package)를 내려받아요" -+msgstr "최신 모듈에서 꾸러미만 내려받기" - - #: plugins/modulesync.py:85 --#, fuzzy --#| msgid "No match for argument: {}" - msgid "Unable to find a match for argument: '{}'" - msgid_plural "Unable to find a match for arguments: '{}'" --msgstr[0] "일치하는 인수가 없습니다 :{}" -+msgstr[0] "인수와 일치 항목을 찾을 수 없음: '{}'" - - #: plugins/modulesync.py:107 - msgid "" - "Creation of repository failed with return code {}. All downloaded content " - "was kept on the system" --msgstr "" -+msgstr "반환 코드 {}로 인하여 저장소 생성에 실패함. 모두 내려받기된 내용은 " -+"시스템에서 보관됩니다" - - #: plugins/modulesync.py:144 - #, python-brace-format - msgid "No match for artifact '{0}' from module '{1}'" --msgstr "" -+msgstr "모듈 '{1}' 에서 인위 결과물 '{0}'과 일치하는 부분이 없습니다" - - #: plugins/modulesync.py:162 - #, python-brace-format - msgid "No match for package name '{0}' in profile {1} from module {2}" --msgstr "" -+msgstr "모듈 {2}에서 프로파일 {1}인 꾸러미 이름 '{0}'과 일치하는 부분이 없습니다" - - #: plugins/modulesync.py:166 --#, fuzzy --#| msgid "No match for argument: {}" - msgid "No mach for argument '{}'" --msgstr "일치하는 인수가 없습니다 :{}" -+msgstr "인수 '{}'와 일치하는 항목이 없습니다" - - #. TODO(jmracek) Shell we end with an error or with RC 1? - #: plugins/modulesync.py:198 - msgid "Unable to satisfy require {}" --msgstr "" -+msgstr "필요사항 {}를 만족 할 수 없음" - - #: plugins/needs_restarting.py:66 - #, python-brace-format -@@ -890,8 +905,8 @@ msgid "" - "No installed package found for package name \"{pkg}\" specified in needs-" - "restarting file \"{file}\"." - msgstr "" --"재시작이 필요한 파일 \"{file}\" 에 지정한 꾸러미 이름 \"{pkg}\"을 위하여 설치된 꾸러미(package)를 찾을 수 " --"없습니다." -+"재시작이 필요한 파일 \"{file}\" 에 지정한 꾸러미 이름 \"{pkg}\"을 위하여 설치" -+"된 꾸러미를 찾을 수 없습니다." - - #: plugins/needs_restarting.py:220 - msgid "determine updated binaries that need restarting" -@@ -904,7 +919,8 @@ msgstr "이 사용자의 프로세스만 고려하세요" - #: plugins/needs_restarting.py:227 - msgid "" - "only report whether a reboot is required (exit code 1) or not (exit code 0)" --msgstr "재시작이 요구되는 (exit code 1) 또는 아닌(exit code0) 경우에만 보고합니다" -+msgstr "" -+"재시작이 요구되는 (exit code 1) 또는 아닌(exit code0) 경우에만 보고합니다" - - #: plugins/needs_restarting.py:230 - msgid "only report affected systemd services" -@@ -956,25 +972,25 @@ msgstr "연결 후 동작: 잘못된 명령 \"%s\": %s" - msgid "Display a list of unresolved dependencies for repositories" - msgstr "저장소에 대한 확인되지 않은 종속성 목록 표시" - --#: plugins/repoclosure.py:66 --msgid "Repoclosure ended with unresolved dependencies." --msgstr "재구 축은 해결되지 않은 종속성으로 종료되었습니다." -+#: plugins/repoclosure.py:69 -+msgid "Repoclosure ended with unresolved dependencies ({}) across {} packages." -+msgstr "Repoclosure는 {} 꾸러미를 통해 해결되지 않은 의존성 ({})으로 종료되었습니다." - --#: plugins/repoclosure.py:153 -+#: plugins/repoclosure.py:159 - msgid "check packages of the given archs, can be specified multiple times" --msgstr "지정된 아치의 꾸러미(package)를 검사하고 여러 번 지정할 수 있습니다" -+msgstr "지정된 아치의 꾸러미를 검사하고 여러 번 지정할 수 있습니다" - --#: plugins/repoclosure.py:156 -+#: plugins/repoclosure.py:162 - msgid "Specify repositories to check" - msgstr "점검 할 저장소를 지정하세요" - --#: plugins/repoclosure.py:158 -+#: plugins/repoclosure.py:164 - msgid "Check only the newest packages in the repos" --msgstr "저장소 최신 꾸러미(package)만 확인하세요" -+msgstr "저장소 최신 꾸러미만 확인하세요" - --#: plugins/repoclosure.py:161 -+#: plugins/repoclosure.py:167 - msgid "Check closure for this package only" --msgstr "이 꾸러미(package)의 폐쇄만 확인하세요" -+msgstr "이 꾸러미의 폐쇄만 확인하세요" - - #: plugins/repodiff.py:45 - msgid "List differences between two sets of repositories" -@@ -992,7 +1008,9 @@ msgstr "여러 번 사용 될 수 있는, 새로운 저장소를 지정합니다 - msgid "" - "Specify architectures to compare, can be used multiple times. By default, " - "only source rpms are compared." --msgstr "비교 할 구조를 지정하고, 여러 번 사용 될 수 있습니다. 기본적으로, 자원 rpms만 비교됩니다." -+msgstr "" -+"비교 할 구조를 지정하고, 여러 번 사용 될 수 있습니다. 기본적으로, 자원 rpms" -+"만 비교됩니다." - - #: plugins/repodiff.py:67 - msgid "Output additional data about the size of the changes." -@@ -1000,13 +1018,14 @@ msgstr "크기 변화에 대한 추가 자료를 출력합니다." - - #: plugins/repodiff.py:69 - msgid "" --"Compare packages also by arch. By default packages are compared just by " --"name." --msgstr "구조에 의해 꾸러미(package) 또한 비교합니다. 기본적으로 꾸러미(package)는 이름으로만 비교됩니다." -+"Compare packages also by arch. By default packages are compared just by name." -+msgstr "" -+"구조에 의해 꾸러미 또한 비교합니다. 기본적으로 꾸러미는 이름으로만 비교됩니" -+"다." - - #: plugins/repodiff.py:72 - msgid "Output a simple one line message for modified packages." --msgstr "수정된 꾸러미(pacakage)지를 위해 단순히 한 줄 메시지를 출력합니다." -+msgstr "수정된 꾸러미를 위해 단순히 한 줄 메시지를 출력합니다." - - #: plugins/repodiff.py:74 - msgid "" -@@ -1024,11 +1043,11 @@ msgstr "크기 변화: {} bytes" - - #: plugins/repodiff.py:184 - msgid "Added package : {}" --msgstr "추가된 꾸러미(package) : {}" -+msgstr "추가된 꾸러미 : {}" - - #: plugins/repodiff.py:187 - msgid "Removed package: {}" --msgstr "제거된 꾸러미(package): {}" -+msgstr "제거된 꾸러미: {}" - - #: plugins/repodiff.py:190 - msgid "Obsoleted by : {}" -@@ -1040,7 +1059,7 @@ msgid "" - "Upgraded packages" - msgstr "" - "\n" --"향상된 꾸러미(package)" -+"향상된 꾸러미" - - #: plugins/repodiff.py:200 - msgid "" -@@ -1056,7 +1075,7 @@ msgid "" - "Modified packages" - msgstr "" - "\n" --"변형된 꾸러미(package)" -+"변형된 꾸러미" - - #: plugins/repodiff.py:212 - msgid "" -@@ -1068,35 +1087,35 @@ msgstr "" - - #: plugins/repodiff.py:213 - msgid "Added packages: {}" --msgstr "추가된 꾸러미(package): {}" -+msgstr "추가된 꾸러미: {}" - - #: plugins/repodiff.py:214 - msgid "Removed packages: {}" --msgstr "제거된 꾸러미(package): {}" -+msgstr "제거된 꾸러미: {}" - - #: plugins/repodiff.py:216 - msgid "Upgraded packages: {}" --msgstr "향상된 꾸러미(package): {}" -+msgstr "향상된 꾸러미: {}" - - #: plugins/repodiff.py:217 - msgid "Downgraded packages: {}" --msgstr "하향설치된 꾸러미: {}" -+msgstr "하향 설치된 꾸러미: {}" - - #: plugins/repodiff.py:219 - msgid "Modified packages: {}" --msgstr "변형된 꾸러미(package): {}" -+msgstr "변형된 꾸러미: {}" - - #: plugins/repodiff.py:222 - msgid "Size of added packages: {}" --msgstr "크기가 증가된 꾸러미(package): {}" -+msgstr "크기가 증가된 꾸러미: {}" - - #: plugins/repodiff.py:223 - msgid "Size of removed packages: {}" --msgstr "크기가 제거된 꾸러미(package): {}" -+msgstr "크기가 제거된 꾸러미: {}" - - #: plugins/repodiff.py:225 - msgid "Size of modified packages: {}" --msgstr "크기가 변형된 꾸러미(package): {}" -+msgstr "크기가 변형된 꾸러미: {}" - - #: plugins/repodiff.py:228 - msgid "Size of upgraded packages: {}" -@@ -1112,7 +1131,7 @@ msgstr "크기 변경: {}" - - #: plugins/repograph.py:50 - msgid "Output a full package dependency graph in dot format" --msgstr "도트 형식의 전체 꾸러미(package) 종속성 그래프 출력" -+msgstr "도트 형식의 전체 꾸러미 종속성 그래프 출력" - - #: plugins/repograph.py:110 - #, python-format -@@ -1121,7 +1140,7 @@ msgstr "아무것도 제공하지 않습니다 : '%s'" - - #: plugins/repomanage.py:45 - msgid "Manage a directory of rpm packages" --msgstr "rpm 꾸러미(package) 디렉토리 관리" -+msgstr "rpm 꾸러미 디렉토리 관리" - - #: plugins/repomanage.py:59 - msgid "Pass either --old or --new, not both!" -@@ -1137,7 +1156,7 @@ msgstr "{}을 열 수 없습니다" - - #: plugins/repomanage.py:180 - msgid "Print the older packages" --msgstr "이전 꾸러미(package) 인쇄" -+msgstr "이전 꾸러미 인쇄" - - #: plugins/repomanage.py:182 - msgid "Print the newest packages" -@@ -1157,7 +1176,7 @@ msgstr "디렉토리 경로" - - #: plugins/reposync.py:55 - msgid "download all packages from remote repo" --msgstr "원격 저장소에서 모든 꾸러미(package)를 내려받아요" -+msgstr "원격 저장소에서 모든 꾸러미를 내려받아요" - - #: plugins/reposync.py:64 - msgid "download only packages for this ARCH" -@@ -1181,9 +1200,11 @@ msgstr "또한 comps.xml 내려받기와 압축 풀기" - - #: plugins/reposync.py:75 - msgid "" --"where to store downloaded repository metadata. Defaults to the value of " --"--download-path." --msgstr "내려받은 저장소 메타데이타를 저장하기 위한 장소. --download-path의 값으로 기본 지정합니다." -+"where to store downloaded repository metadata. Defaults to the value of --" -+"download-path." -+msgstr "" -+"내려받은 저장소 메타데이타를 저장하기 위한 장소. --download-path의 값으로 기" -+"본 지정합니다." - - #: plugins/reposync.py:78 - msgid "download only newest packages per-repo" -@@ -1203,7 +1224,7 @@ msgstr "서버에 있는 하나에서 로컬파일의 로컬 타임스템프 설 - - #: plugins/reposync.py:87 - msgid "download only source packages" --msgstr "원천 꾸러미에서만 내려받습니다" -+msgstr "원천 꾸러미만 내려받기" - - #: plugins/reposync.py:89 - msgid "Just list urls of what would be downloaded, don't download" -@@ -1251,7 +1272,7 @@ msgstr "저장소에 대한 comps.xml %s 저장된" - - #: plugins/show_leaves.py:54 - msgid "New leaves:" --msgstr "독립 꾸러미(package):" -+msgstr "독립 꾸러미:" - - #: plugins/versionlock.py:33 - #, python-format -@@ -1299,7 +1320,8 @@ msgid "Versionlock plugin: number of lock rules from file \"{}\" applied: {}" - msgstr "버전 잠금 플러그인: 적용된 파일 \"{} \"에서 잠금 규칙의 수: {}" - - #: plugins/versionlock.py:44 --msgid "Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" -+msgid "" -+"Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" - msgstr "버전 잠금 플러그인: 적용된 파일 \"{} \"에서 제외 규칙의 수: {}" - - #: plugins/versionlock.py:45 -@@ -1316,7 +1338,9 @@ msgstr "꾸러미(package) 사양을 그대로 사용하며, 구문 분석을 - - #: plugins/versionlock.py:164 - msgid "Subcommand '{}' is deprecated. Use 'exclude' subcommand instead." --msgstr "하위명령 '{}'가 더 이상 사용되지 않습니다. 대신에 '예외' 하위명령를 사용합니다." -+msgstr "" -+"하위명령 '{}'는 더 이상 사용하지 않습니다. 대신에 하위명령 'exclude'를 사용합" -+"니다." - - #~ msgid "" - #~ "This repository does not have any builds yet so you cannot enable it now." -diff --git a/po/zh_CN.po b/po/zh_CN.po -index 7959618..1db2a02 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -5,21 +5,24 @@ - # cheng ye <18969068329@163.com>, 2017. #zanata - # Ludek Janda , 2018. #zanata, 2021. - # Hongqiao Chen , 2020. -+# Sundeep Anand , 2021. - # Qiyu Yan , 2021. -+# Transtats , 2022. - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2022-01-11 01:55+0000\n" --"PO-Revision-Date: 2021-09-11 10:04+0000\n" --"Last-Translator: Ludek Janda \n" --"Language-Team: Chinese (Simplified) \n" -+"POT-Creation-Date: 2022-08-31 13:39+0200\n" -+"PO-Revision-Date: 2022-09-07 14:19+0000\n" -+"Last-Translator: Transtats \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: Weblate 4.8\n" -+"X-Generator: Weblate 4.14\n" - - #: plugins/builddep.py:45 - msgid "[PACKAGE|PACKAGE.spec]" -@@ -59,8 +62,7 @@ msgid "Some packages could not be found." - msgstr "某些软件包无法找到。" - - #. No provides, no files --#. Richdeps can have no matches but it could be correct (solver must decide --#. later) -+#. Richdeps can have no matches but it could be correct (solver must decide later) - #: plugins/builddep.py:173 - #, python-format - msgid "No matching package to install: '%s'" -@@ -80,7 +82,7 @@ msgstr "没有满足全部的依赖关系" - msgid "Failed to open: '%s', not a valid spec file: %s" - msgstr "打开失败： '%s'， 不是有效的 spec 文件： %s" - --#: plugins/builddep.py:230 plugins/repoclosure.py:118 -+#: plugins/builddep.py:230 plugins/repoclosure.py:124 - #, python-format - msgid "no package matched: %s" - msgstr "无匹配软件包： %s" -@@ -98,7 +100,8 @@ msgstr "查看软件包的改变日志数据" - msgid "" - "show changelog entries since DATE. To avoid ambiguosity, YYYY-MM-DD format " - "is recommended." --msgstr "显示自 DATE 开始的改变日志信息。为了避免混淆，推荐使用 YYYY-MM-DD 格式。" -+msgstr "" -+"显示自 DATE 开始的改变日志信息。为了避免混淆，推荐使用 YYYY-MM-DD 格式。" - - #: plugins/changelog.py:55 - msgid "show given number of changelog entries per package" -@@ -182,8 +185,8 @@ msgid "" - "Warning: --enablerepo/--disablerepo arguments have no meaningwith config " - "manager. Use --set-enabled/--set-disabled instead." - msgstr "" --"警告：--enablerepo/--disablerepo 参数对于 config manager 没有作用。请使用 --set-" --"enabled/--set-disabled。" -+"警告：--enablerepo/--disablerepo 参数对于 config manager 没有作用。请使用 --" -+"set-enabled/--set-disabled。" - - #: plugins/config_manager.py:132 - #, python-format -@@ -283,44 +286,45 @@ msgstr "按照用户 NAME 列出可用的 Copr 仓库" - msgid "Specify an instance of Copr to work with" - msgstr "指定需要使用的 Copr 实例" - --#: plugins/copr.py:164 plugins/copr.py:232 plugins/copr.py:259 -+#: plugins/copr.py:164 plugins/copr.py:236 plugins/copr.py:263 - msgid "Error: " - msgstr "错误： " - - #: plugins/copr.py:165 - msgid "" --"specify Copr hub either with `--hub` or using " --"`copr_hub/copr_username/copr_projectname` format" -+"specify Copr hub either with `--hub` or using `copr_hub/copr_username/" -+"copr_projectname` format" - msgstr "" --"使用 `--hub` 或使用 `copr_hub/copr_username/copr_projectname` 格式指定 Copr hub" -+"使用 `--hub` 或使用 `copr_hub/copr_username/copr_projectname` 格式指定 Copr " -+"hub" - - #: plugins/copr.py:168 - msgid "multiple hubs specified" - msgstr "指定多个 hub" - --#: plugins/copr.py:233 plugins/copr.py:237 -+#: plugins/copr.py:237 plugins/copr.py:241 - msgid "exactly two additional parameters to copr command are required" - msgstr "Copr 命令要求有且仅有两个额外参数" - --#: plugins/copr.py:242 -+#: plugins/copr.py:246 - msgid "Too many arguments." - msgstr "参数过多。" - --#: plugins/copr.py:245 -+#: plugins/copr.py:249 - msgid "" - "Bad format of optional chroot. The format is distribution-version-" - "architecture." - msgstr "可选 chroot 的错误格式。格式为 distribution-version-architecture。" - --#: plugins/copr.py:260 -+#: plugins/copr.py:264 - msgid "use format `copr_username/copr_projectname` to reference copr project" - msgstr "使用格式 `copr_username/copr_projectname` 来引用 Copr 项目" - --#: plugins/copr.py:262 -+#: plugins/copr.py:266 - msgid "bad copr project format" - msgstr "错误的 Copr 项目格式" - --#: plugins/copr.py:276 -+#: plugins/copr.py:280 - msgid "" - "\n" - "Enabling a Copr repository. Please note that this repository is not part\n" -@@ -328,7 +332,8 @@ msgid "" - "\n" - "The Fedora Project does not exercise any power over the contents of\n" - "this repository beyond the rules outlined in the Copr FAQ at\n" --",\n" -+",\n" - "and packages are not held to any quality or security level.\n" - "\n" - "Please do not file bug reports about these packages in Fedora\n" -@@ -339,95 +344,94 @@ msgstr "" - "不是主发行版本的一部分，质量可能会有所不同。\n" - "\n" - "Fedora 项目对其不行使除了于 Copr 常见问题\n" --"\n" -+"\n" - "中所提出的规则外的任何权力，并且其软件包不保证达到特定质量\n" - "和安全水准。\n" - "\n" - "请不要在 Fedora Bugzilla 中报告这些软件包中出现的\n" - "问题。当出现问题时，请联系仓库的所有者。\n" - --#: plugins/copr.py:293 -+#: plugins/copr.py:297 - msgid "Repository successfully enabled." - msgstr "启用软件仓库成功。" - --#: plugins/copr.py:298 -+#: plugins/copr.py:302 - msgid "Repository successfully disabled." - msgstr "禁用软件仓库成功。" - --#: plugins/copr.py:302 -+#: plugins/copr.py:306 - msgid "Repository successfully removed." - msgstr "软件仓库已成功删除。" - --#: plugins/copr.py:306 plugins/copr.py:719 -+#: plugins/copr.py:310 plugins/copr.py:721 - msgid "Unknown subcommand {}." - msgstr "未知的子命令 {}。" - --#: plugins/copr.py:363 -+#: plugins/copr.py:367 - msgid "" --"* These coprs have repo file with an old format that contains no information" --" about Copr hub - the default one was assumed. Re-enable the project to fix " -+"* These coprs have repo file with an old format that contains no information " -+"about Copr hub - the default one was assumed. Re-enable the project to fix " - "this." - msgstr "" --"* 这些 coprs 有使用旧格式的 repo 文件，它们没有包括 Copr hub 的信息 - 假设使用默认值。重新启用项目来解决这个问题。" -+"* 这些 coprs 有使用旧格式的 repo 文件，它们没有包括 Copr hub 的信息 - 假设使" -+"用默认值。重新启用项目来解决这个问题。" - --#: plugins/copr.py:376 -+#: plugins/copr.py:380 - msgid "Can't parse repositories for username '{}'." - msgstr "无法为用户名 username '{}' 解析仓库。" - --#: plugins/copr.py:379 -+#: plugins/copr.py:383 - msgid "List of {} coprs" - msgstr "{} Coprs 列表" - --#: plugins/copr.py:384 -+#: plugins/copr.py:388 - msgid "No description given" - msgstr "没有给出描述" - --#: plugins/copr.py:396 -+#: plugins/copr.py:400 - msgid "Can't parse search for '{}'." - msgstr "无法解析针对 '{}' 的搜索。" - --#: plugins/copr.py:399 -+#: plugins/copr.py:403 - msgid "Matched: {}" - msgstr "匹配：{}" - --#: plugins/copr.py:404 -+#: plugins/copr.py:408 - msgid "No description given." - msgstr "没有给出描述。" - --#: plugins/copr.py:426 -+#: plugins/copr.py:430 - msgid "Safe and good answer. Exiting." - msgstr "安全及明智的答案。退出。" - --#: plugins/copr.py:433 -+#: plugins/copr.py:437 - msgid "This command has to be run under the root user." - msgstr "该命令必须以 root 用户运行。" - --#: plugins/copr.py:485 -+#: plugins/copr.py:487 - #, python-brace-format - msgid "Request to {0} failed: {1} - {2}" --msgstr "" -+msgstr "请求 {0} 失败：{1} - {2}" - --#: plugins/copr.py:487 -+#: plugins/copr.py:489 - msgid "It wasn't possible to enable this project.\n" --msgstr "" -+msgstr "无法启用此项目。\n" - --#: plugins/copr.py:492 --#, fuzzy, python-brace-format --#| msgid "Such repository does not exist." -+#: plugins/copr.py:494 -+#, python-brace-format - msgid "Repository '{0}' does not exist in project '{1}'." --msgstr "该软件仓库不存在。" -+msgstr "仓库 '{0}' 在项目 '{1}' 中不存在。" - --#: plugins/copr.py:495 --#, fuzzy --#| msgid "List enabled Copr repositories" -+#: plugins/copr.py:497 - msgid "" - "\n" - "Available repositories: " - msgstr "" - "\n" --"列出启动的 Copr 仓库 " -+"可用软件仓库： " - --#: plugins/copr.py:497 -+#: plugins/copr.py:499 - #, python-brace-format - msgid "" - "\n" -@@ -436,20 +440,23 @@ msgid "" - " 'dnf copr enable {0} '\n" - "But note that the installed repo file will likely need a manual modification." - msgstr "" -+"\n" -+"\n" -+"如果需要启用一个非默认的仓库，使用以下命令 :\n" -+" 'dnf copr enable {0} '\n" -+"但请注意，安装的 repo 文件将来可能需要手动修改。" - --#: plugins/copr.py:503 --#, fuzzy, python-brace-format --#| msgid "Such repository does not exist." -+#: plugins/copr.py:505 -+#, python-brace-format - msgid "Project {0} does not exist." --msgstr "该软件仓库不存在。" -+msgstr "项目 {0} 不存在。" - --#: plugins/copr.py:506 --#, fuzzy, python-brace-format --#| msgid "Failed to remove copr repo {0}/{1}/{2}" -+#: plugins/copr.py:508 -+#, python-brace-format - msgid "Failed to connect to {0}: {1}" --msgstr "删除 copr 仓库 {0}/{1}/{2} 失败" -+msgstr "连接到 {0} 失败：{1}" - --#: plugins/copr.py:553 -+#: plugins/copr.py:555 - #, python-brace-format - msgid "" - "Maintainer of the enabled Copr repository decided to make\n" -@@ -478,44 +485,44 @@ msgstr "" - "\n" - "这些仓库已被自动启用。" - --#: plugins/copr.py:574 -+#: plugins/copr.py:576 - msgid "Do you want to keep them enabled?" - msgstr "您需要保持它们被启用吗？" - --#: plugins/copr.py:607 -+#: plugins/copr.py:609 - #, python-brace-format - msgid "Failed to remove copr repo {0}/{1}/{2}" --msgstr "删除 copr 仓库 {0}/{1}/{2} 失败" -+msgstr "无法删除 copr 存储库 {0}/{1}/{2}" - --#: plugins/copr.py:618 -+#: plugins/copr.py:620 - msgid "Failed to disable copr repo {}/{}" --msgstr "无法禁用 Copr 软件仓库 {}/{}" -+msgstr "无法禁用 Copr 存储库 {}/{}" - --#: plugins/copr.py:636 plugins/copr.py:673 -+#: plugins/copr.py:638 plugins/copr.py:675 - msgid "Unknown response from server." - msgstr "来自服务器的未知响应。" - --#: plugins/copr.py:658 -+#: plugins/copr.py:660 - msgid "Interact with Playground repository." - msgstr "与 Playground 仓库交互。" - --#: plugins/copr.py:664 -+#: plugins/copr.py:666 - msgid "Enabling a Playground repository." - msgstr "启用 Playground 仓库。" - --#: plugins/copr.py:665 -+#: plugins/copr.py:667 - msgid "Do you want to continue?" - msgstr "您希望继续吗？" - --#: plugins/copr.py:709 -+#: plugins/copr.py:711 - msgid "Playground repositories successfully enabled." - msgstr "启用 Playground 仓库成功。" - --#: plugins/copr.py:712 -+#: plugins/copr.py:714 - msgid "Playground repositories successfully disabled." - msgstr "禁用 Playground 仓库成功。" - --#: plugins/copr.py:716 -+#: plugins/copr.py:718 - msgid "Playground repositories successfully updated." - msgstr "更新 Playground 仓库成功。" - -@@ -562,7 +569,9 @@ msgstr "限制到指定类型" - msgid "" - "Allow removing of install-only packages. Using this option may result in an " - "attempt to remove the running kernel." --msgstr "允许删除仅安装(install-only)的软件包。使用这个选项可能会导致尝试删除正在运行的内核。" -+msgstr "" -+"允许删除仅安装(install-only)的软件包。使用这个选项可能会导致尝试删除正在运行" -+"的内核。" - - #: plugins/debug.py:202 - msgid "name of dump file" -@@ -766,7 +775,7 @@ msgstr "软件包规格" - - #: plugins/groups_manager.py:156 - msgid "Can't edit group without specifying it (use --id or --name)" --msgstr "没有指定组（使用 --id 或 --name）就无法编辑组" -+msgstr "没有指定它（使用 --id 或 --name）就不能编辑组" - - #: plugins/groups_manager.py:190 - msgid "Can't load file \"{}\": {}" -@@ -786,8 +795,8 @@ msgstr "无法从不存在的组中删除软件包" - - #: plugins/groups_manager.py:307 - msgid "" --"Group id '{}' generated from '{}' is duplicit. Please specify group id using" --" --id." -+"Group id '{}' generated from '{}' is duplicit. Please specify group id using " -+"--id." - msgstr "从 '{}' 生成的组 id '{}' 是显式的。请使用 --id 指定组 ID。" - - #: plugins/leaves.py:32 -@@ -825,74 +834,65 @@ msgstr "正在迁移历史数据…" - #: plugins/modulesync.py:37 - msgid "" - "Download packages from modules and/or create a repository with modular data" --msgstr "" -+msgstr "从模块下载软件包和/或创建带有模块化数据的存储库" - - #: plugins/modulesync.py:44 - msgid "MODULE" --msgstr "" -+msgstr "模块" - - #: plugins/modulesync.py:45 --#, fuzzy --#| msgid "packages to download" - msgid "modules to download" --msgstr "将要下载的软件包" -+msgstr "要下载的模块" - - #: plugins/modulesync.py:47 --#, fuzzy --#| msgid "Specify repositories to check" - msgid "enable repositories with source packages" --msgstr "指定要检查的软件仓库" -+msgstr "启用带有源软件包的软件仓库" - - #: plugins/modulesync.py:49 - msgid "enable repositories with debug-info and debug-source packages" --msgstr "" -+msgstr "启用带有 debug-info 和 debug-source 软件包的软件仓库" - - #: plugins/modulesync.py:53 --#, fuzzy --#| msgid "download all packages from remote repo" - msgid "download only packages from newest modules" --msgstr "下载远程仓库中的全部软件包" -+msgstr "只从最新的模块中下载软件包" - - #: plugins/modulesync.py:85 --#, fuzzy --#| msgid "No match for argument: {}" - msgid "Unable to find a match for argument: '{}'" - msgid_plural "Unable to find a match for arguments: '{}'" --msgstr[0] "未找到匹配的参数： {}" -+msgstr[0] "找不到与参数匹配的项：'{}'" - - #: plugins/modulesync.py:107 - msgid "" - "Creation of repository failed with return code {}. All downloaded content " - "was kept on the system" --msgstr "" -+msgstr "创建存储库会失败，并显示返回码 {}。所有下载的内容都保存在系统上" - - #: plugins/modulesync.py:144 - #, python-brace-format - msgid "No match for artifact '{0}' from module '{1}'" --msgstr "" -+msgstr "没有与模块 '{1}' 的工件 '{0}' 相匹配的项" - - #: plugins/modulesync.py:162 - #, python-brace-format - msgid "No match for package name '{0}' in profile {1} from module {2}" --msgstr "" -+msgstr "没有与模块 {2} 中配置文件 {1} 的软件包名称 '{0}' 相匹配的项" - - #: plugins/modulesync.py:166 --#, fuzzy --#| msgid "No match for argument: {}" - msgid "No mach for argument '{}'" --msgstr "未找到匹配的参数： {}" -+msgstr "没有与参数 '{}' 相匹配的项" - - #. TODO(jmracek) Shell we end with an error or with RC 1? - #: plugins/modulesync.py:198 - msgid "Unable to satisfy require {}" --msgstr "" -+msgstr "无法满足要求 {}" - - #: plugins/needs_restarting.py:66 - #, python-brace-format - msgid "" - "No installed package found for package name \"{pkg}\" specified in needs-" - "restarting file \"{file}\"." --msgstr "没有为在需要重新启动文件 \"{file}\" 中指定的名为 \"{pkg}\" 的软件包找到安装的软件包。" -+msgstr "未找到在需要重新启动的文件 \"{file}\" 中指定的软件包名为 \"{pkg}\" " -+"的已安装的软件包。" - - #: plugins/needs_restarting.py:220 - msgid "determine updated binaries that need restarting" -@@ -957,23 +957,23 @@ msgstr "事物后的操作 : 无效的命令 \"%s\": %s" - msgid "Display a list of unresolved dependencies for repositories" - msgstr "显示仓库中未被解决的依赖关系的列表" - --#: plugins/repoclosure.py:66 --msgid "Repoclosure ended with unresolved dependencies." --msgstr "Repoclosure 退出时还有依赖关系未解决。" -+#: plugins/repoclosure.py:69 -+msgid "Repoclosure ended with unresolved dependencies ({}) across {} packages." -+msgstr "Repoclosure 退出时还有未解决的依赖项（{}），针对 {} 软件包。" - --#: plugins/repoclosure.py:153 -+#: plugins/repoclosure.py:159 - msgid "check packages of the given archs, can be specified multiple times" - msgstr "检查给定架构的软件包，可以被指定多次" - --#: plugins/repoclosure.py:156 -+#: plugins/repoclosure.py:162 - msgid "Specify repositories to check" - msgstr "指定要检查的软件仓库" - --#: plugins/repoclosure.py:158 -+#: plugins/repoclosure.py:164 - msgid "Check only the newest packages in the repos" - msgstr "只检查仓库中最新的软件包" - --#: plugins/repoclosure.py:161 -+#: plugins/repoclosure.py:167 - msgid "Check closure for this package only" - msgstr "仅为该软件包检查依赖闭合性" - -@@ -1001,8 +1001,7 @@ msgstr "输出关于改变大小的额外数据。" - - #: plugins/repodiff.py:69 - msgid "" --"Compare packages also by arch. By default packages are compared just by " --"name." -+"Compare packages also by arch. By default packages are compared just by name." - msgstr "同时按架构比较软件包。在默认情况下只按名称比较软件包。" - - #: plugins/repodiff.py:72 -@@ -1126,7 +1125,7 @@ msgstr "管理 RPM 软件包目录" - - #: plugins/repomanage.py:59 - msgid "Pass either --old or --new, not both!" --msgstr "传入 --old 或者 --new，不可同时传入！" -+msgstr "传递 --old 或者 --new，而不是两者都传递！" - - #: plugins/repomanage.py:89 - msgid "No files to process" -@@ -1182,8 +1181,8 @@ msgstr "同时下载并解压 comps.xml" - - #: plugins/reposync.py:75 - msgid "" --"where to store downloaded repository metadata. Defaults to the value of " --"--download-path." -+"where to store downloaded repository metadata. Defaults to the value of --" -+"download-path." - msgstr "存储下载的仓库元数据的位置。默认为 --download-path 的值。" - - #: plugins/reposync.py:78 -@@ -1204,7 +1203,7 @@ msgstr "根据服务器上的文件设置本地文件的本地时间戳" - - #: plugins/reposync.py:87 - msgid "download only source packages" --msgstr "只下载源码包" -+msgstr "只下载源软件包" - - #: plugins/reposync.py:89 - msgid "Just list urls of what would be downloaded, don't download" -@@ -1300,7 +1299,8 @@ msgid "Versionlock plugin: number of lock rules from file \"{}\" applied: {}" - msgstr "Versionlock 插件: 文件 \"{}\" 中的锁定数量规则被应用：{}" - - #: plugins/versionlock.py:44 --msgid "Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" -+msgid "" -+"Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" - msgstr "Versionlock 插件: 文件 \"{}\" 中的排除规则数量被应用：{}" - - #: plugins/versionlock.py:45 -@@ -1317,7 +1317,7 @@ msgstr "按原样使用程序包规格，请勿尝试解析它们" - - #: plugins/versionlock.py:164 - msgid "Subcommand '{}' is deprecated. Use 'exclude' subcommand instead." --msgstr "子命令 '{}' 已被弃用。请换用 'exclude' 子命令。" -+msgstr "子命令 '{}' 已被弃用。改为使用 'exclude' 子命令。" - - #~ msgid "" - #~ "This repository does not have any builds yet so you cannot enable it now." --- -2.37.3 - diff --git a/SOURCES/0003-offline-upgrade-Add-security-filters.patch b/SOURCES/0003-offline-upgrade-Add-security-filters.patch new file mode 100644 index 0000000..f15d5d9 --- /dev/null +++ b/SOURCES/0003-offline-upgrade-Add-security-filters.patch @@ -0,0 +1,61 @@ +From eef927ac825c1a07082e10ffbf11e16ecbd7688c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tarc=C3=ADsio=20Ladeia=20de=20Oliveira?= + +Date: Thu, 20 Oct 2022 22:16:59 -0300 +Subject: [PATCH 1/2] [offline-upgrade] Add security filters (RhBug:1939975) + +Add support for security filter options that are available in the main +`dnf` commands, that is, `--advisory`, `--bugfix`, `--security`, and +`--enhancement`. + += changelog = +msg: [offline-upgrade] Add support for security filters +type: bugfix +resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1939975 +--- + plugins/system_upgrade.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/plugins/system_upgrade.py b/plugins/system_upgrade.py +index 0baf978..ef1de73 100644 +--- a/plugins/system_upgrade.py ++++ b/plugins/system_upgrade.py +@@ -467,6 +467,9 @@ class SystemUpgradeCommand(dnf.cli.Command): + logger.error(_("Operation aborted.")) + sys.exit(1) + check_release_ver(self.base.conf, target=self.opts.releasever) ++ elif 'offline-upgrade' == self.opts.command: ++ self.cli._populate_update_security_filter(self.opts) ++ + self.cli.demands.root_user = True + self.cli.demands.resolving = True + self.cli.demands.available_repos = True +-- +2.38.1 + + +From 7e5d3028caa743f3e5ac7bf921c3ec39a4d2c85b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tarc=C3=ADsio=20Ladeia=20de=20Oliveira?= + +Date: Thu, 20 Oct 2022 22:27:22 -0300 +Subject: [PATCH 2/2] Add myself as contributor in AUTHORS + +--- + AUTHORS | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/AUTHORS b/AUTHORS +index 352e195..f098cb6 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -32,6 +32,7 @@ DNF-PLUGINS-CORE CONTRIBUTORS + Neal Gompa + Paul Howarth + Rickard Dybeck ++ Tarcísio Ladeia de Oliveira + Tomas Babej + Vladan Kudlac + Wieland Hoffmann +-- +2.38.1 + diff --git a/SOURCES/0004-system-upgrade-Show-warning-always-for-a-downstream.patch b/SOURCES/0004-system-upgrade-Show-warning-always-for-a-downstream.patch new file mode 100644 index 0000000..d5b4ce9 --- /dev/null +++ b/SOURCES/0004-system-upgrade-Show-warning-always-for-a-downstream.patch @@ -0,0 +1,62 @@ +From e04aff1e65fb260912e7e0feeb201e17fa5abda4 Mon Sep 17 00:00:00 2001 +From: Jan Kolarik +Date: Fri, 16 Dec 2022 05:55:19 +0000 +Subject: [PATCH] system-upgrade: Show warning always for a downstream + +As the distro package is not available in the BaseOS, the warning implementation will be shown always, but only in related downstreams. + += changelog = +type: bugfix +resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2152846 +--- + dnf-plugins-core.spec | 3 ++- + plugins/system_upgrade.py | 6 ++---- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec +index 1ee87a1..4df6e44 100644 +--- a/dnf-plugins-core.spec ++++ b/dnf-plugins-core.spec +@@ -148,13 +148,14 @@ Summary: Core Plugins for DNF + %{?python_provide:%python_provide python3-%{name}} + BuildRequires: python3-dbus + BuildRequires: python3-devel +-BuildRequires: python3-distro + BuildRequires: python3-dnf >= %{dnf_lowest_compatible} + BuildRequires: python3-systemd + BuildRequires: pkgconfig(systemd) + BuildRequires: systemd + %{?systemd_ordering} ++%if 0%{?fedora} + Requires: python3-distro ++%endif + Requires: python3-dbus + Requires: python3-dnf >= %{dnf_lowest_compatible} + Requires: python3-hawkey >= %{hawkey_version} +diff --git a/plugins/system_upgrade.py b/plugins/system_upgrade.py +index ef1de73..4f7620f 100644 +--- a/plugins/system_upgrade.py ++++ b/plugins/system_upgrade.py +@@ -20,7 +20,6 @@ + """system_upgrade.py - DNF plugin to handle major-version system upgrades.""" + + from subprocess import call, Popen, check_output, CalledProcessError +-import distro + import json + import os + import os.path +@@ -452,9 +451,8 @@ class SystemUpgradeCommand(dnf.cli.Command): + + def configure_download(self): + if 'system-upgrade' == self.opts.command or 'fedup' == self.opts.command: +- if distro.id() == 'rhel': +- logger.warning(_('WARNING: this operation is not supported on the RHEL distribution. ' +- 'Proceed at your own risk.')) ++ logger.warning(_('WARNING: this operation is not supported on the RHEL distribution. ' ++ 'Proceed at your own risk.')) + help_url = get_url_from_os_release() + if help_url: + msg = _('Additional information for System Upgrade: {}') +-- +2.39.0 + diff --git a/SOURCES/0005-Update-translations.patch b/SOURCES/0005-Update-translations.patch new file mode 100644 index 0000000..b9423d2 --- /dev/null +++ b/SOURCES/0005-Update-translations.patch @@ -0,0 +1,2782 @@ +From cf8fa271469d1da6ba42b44d3e6e1d08484cef33 Mon Sep 17 00:00:00 2001 +From: Marek Blaha +Date: Wed, 15 Mar 2023 14:56:50 +0100 +Subject: [PATCH] Update translations + +--- + po/dnf-plugins-core.pot | 171 +++++++++++++++- + po/fr.po | 318 +++++++++++++++++++++++------ + po/ja.po | 431 +++++++++++++++++++++++++++++++--------- + po/ko.po | 376 +++++++++++++++++++++++++++-------- + po/zh_CN.po | 310 +++++++++++++++++++++++------ + 5 files changed, 1306 insertions(+), 300 deletions(-) + +diff --git a/po/dnf-plugins-core.pot b/po/dnf-plugins-core.pot +index 98ba30d..51a2b8e 100644 +--- a/po/dnf-plugins-core.pot ++++ b/po/dnf-plugins-core.pot +@@ -8,7 +8,7 @@ msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-08-19 03:05+0000\n" ++"POT-Creation-Date: 2023-02-28 12:26+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME \n" + "Language-Team: LANGUAGE \n" +@@ -1201,6 +1201,175 @@ msgstr "" + msgid "New leaves:" + msgstr "" + ++#. Translators: This string is only used in unit tests. ++#: plugins/system_upgrade.py:45 ++msgid "the color of the sky" ++msgstr "" ++ ++#: plugins/system_upgrade.py:57 ++msgid "Need a --releasever greater than the current system version." ++msgstr "" ++ ++#. Translators: do not change "reboot" here ++#: plugins/system_upgrade.py:59 ++#, python-brace-format ++msgid "" ++"Download complete! Use 'dnf {command} reboot' to start the upgrade.\n" ++"To remove cached metadata and transaction use 'dnf {command} clean'" ++msgstr "" ++ ++#: plugins/system_upgrade.py:62 ++msgid "Sorry, you need to use 'download --releasever' instead of '--network'" ++msgstr "" ++ ++#: plugins/system_upgrade.py:71 ++msgid "Reboot turned off, not rebooting." ++msgstr "" ++ ++#: plugins/system_upgrade.py:122 ++#, python-format ++msgid "Screen blanking can't be disabled: %s" ++msgstr "" ++ ++#: plugins/system_upgrade.py:142 ++#, python-format ++msgid "Failed loading state file: %s, continuing with empty state." ++msgstr "" ++ ++#: plugins/system_upgrade.py:289 ++msgid "The following boots appear to contain upgrade logs:" ++msgstr "" ++ ++#: plugins/system_upgrade.py:299 ++msgid "-- no logs were found --" ++msgstr "" ++ ++#: plugins/system_upgrade.py:314 ++msgid "Cannot find logs with this index." ++msgstr "" ++ ++#: plugins/system_upgrade.py:323 ++msgid "Unable to match systemd journal entry" ++msgstr "" ++ ++#: plugins/system_upgrade.py:344 ++msgid "Prepare system for upgrade to a new release" ++msgstr "" ++ ++#: plugins/system_upgrade.py:360 ++msgid "keep installed packages if the new release's version is older" ++msgstr "" ++ ++#: plugins/system_upgrade.py:364 ++msgid "which logs to show" ++msgstr "" ++ ++#: plugins/system_upgrade.py:398 ++#, python-brace-format ++msgid "Incompatible version of data. Rerun 'dnf {command} download [OPTIONS]'" ++msgstr "" ++ ++#: plugins/system_upgrade.py:434 ++msgid "Command 'offline-distrosync' cannot be used with --no-downgrade option" ++msgstr "" ++ ++#: plugins/system_upgrade.py:454 ++msgid "" ++"WARNING: this operation is not supported on the RHEL distribution. Proceed " ++"at your own risk." ++msgstr "" ++ ++#: plugins/system_upgrade.py:458 ++msgid "Additional information for System Upgrade: {}" ++msgstr "" ++ ++#: plugins/system_upgrade.py:461 ++msgid "" ++"Before you continue ensure that your system is fully upgraded by running " ++"\"dnf --refresh upgrade\". Do you want to continue" ++msgstr "" ++ ++#: plugins/system_upgrade.py:465 ++msgid "Operation aborted." ++msgstr "" ++ ++#: plugins/system_upgrade.py:526 ++msgid "system is not ready for upgrade" ++msgstr "" ++ ++#: plugins/system_upgrade.py:529 ++#, python-brace-format ++msgid "" ++"the transaction was not prepared for '{command}'. Rerun 'dnf {command} " ++"download [OPTIONS]'" ++msgstr "" ++ ++#: plugins/system_upgrade.py:533 ++msgid "upgrade is already scheduled" ++msgstr "" ++ ++#: plugins/system_upgrade.py:539 ++msgid "trigger file does not exist. exiting quietly." ++msgstr "" ++ ++#: plugins/system_upgrade.py:542 ++msgid "another upgrade tool is running. exiting quietly." ++msgstr "" ++ ++#: plugins/system_upgrade.py:551 ++#, python-brace-format ++msgid "use 'dnf {command} reboot' to begin the upgrade" ++msgstr "" ++ ++#: plugins/system_upgrade.py:569 ++msgid "Rebooting to perform upgrade." ++msgstr "" ++ ++#: plugins/system_upgrade.py:602 ++msgid "Starting offline upgrade. This will take a while." ++msgstr "" ++ ++#: plugins/system_upgrade.py:604 ++msgid "Starting offline distrosync. This will take a while." ++msgstr "" ++ ++#: plugins/system_upgrade.py:606 ++msgid "Starting system upgrade. This will take a while." ++msgstr "" ++ ++#: plugins/system_upgrade.py:622 ++msgid "Cleaning up downloaded data..." ++msgstr "" ++ ++#: plugins/system_upgrade.py:652 ++msgid "" ++"The system-upgrade transaction is empty, your system is already up-to-date." ++msgstr "" ++ ++#: plugins/system_upgrade.py:661 ++msgid "Transaction saved to {}." ++msgstr "" ++ ++#: plugins/system_upgrade.py:664 ++msgid "Error storing transaction: {}" ++msgstr "" ++ ++#: plugins/system_upgrade.py:686 ++msgid "Download finished." ++msgstr "" ++ ++#: plugins/system_upgrade.py:689 plugins/system_upgrade.py:690 ++msgid "Upgrade complete! Cleaning up and rebooting..." ++msgstr "" ++ ++#: plugins/system_upgrade.py:699 ++msgid "Prepare offline upgrade of the system" ++msgstr "" ++ ++#: plugins/system_upgrade.py:704 ++msgid "Prepare offline distrosync of the system" ++msgstr "" ++ + #: plugins/versionlock.py:33 + #, python-format + msgid "Unable to read version lock configuration: %s" +diff --git a/po/fr.po b/po/fr.po +index 7f3fd0b..c35064b 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -5,23 +5,25 @@ + # Jean-Baptiste Holcroft , 2018. #zanata, 2020. + # Ludek Janda , 2018. #zanata, 2021, 2022. + # Jean-Baptiste Holcroft , 2019. #zanata, 2020. +-# Julien Humbert , 2020, 2021, 2022. +-# Arnaud T. , 2021. +-# Transtats , 2022. ++# Julien Humbert , 2020, 2021. ++# Sundeep Anand , 2021. ++# Transtats , 2022, 2023. ++# blutch112 , 2022. + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-08-08 02:57+0000\n" +-"PO-Revision-Date: 2022-03-09 12:39+0000\n" +-"Last-Translator: Ludek Janda \n" +-"Language-Team: French \n" ++"POT-Creation-Date: 2023-02-28 12:26+0100\n" ++"PO-Revision-Date: 2023-03-06 13:48+0000\n" ++"Last-Translator: Transtats \n" ++"Language-Team: French \n" + "Language: fr\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=n > 1;\n" +-"X-Generator: Weblate 4.11.2\n" ++"X-Generator: Weblate 4.15.2\n" + + #: plugins/builddep.py:45 + msgid "[PACKAGE|PACKAGE.spec]" +@@ -42,8 +44,7 @@ msgstr "définit une macro pour l’interprétation du fichier spec" + + #: plugins/builddep.py:95 + msgid "skip build dependencies not available in repositories" +-msgstr "" +-"ignorer les dépendances de compilation non disponibles dans les dépôts" ++msgstr "ignorer les dépendances de compilation non disponibles dans les dépôts" + + #: plugins/builddep.py:98 + msgid "treat commandline arguments as spec files" +@@ -62,8 +63,7 @@ msgid "Some packages could not be found." + msgstr "Certains paquets n’ont pu être trouvés." + + #. No provides, no files +-#. Richdeps can have no matches but it could be correct (solver must decide +-#. later) ++#. Richdeps can have no matches but it could be correct (solver must decide later) + #: plugins/builddep.py:173 + #, python-format + msgid "No matching package to install: '%s'" +@@ -74,16 +74,23 @@ msgstr "Aucun paquet correspondant à installer : « %s »" + msgid "Failed to open: '%s', not a valid source rpm file." + msgstr "Échec d’ouverture : « %s », n’est pas un fichier source rpm valide." + +-#: plugins/builddep.py:204 plugins/builddep.py:220 plugins/builddep.py:237 ++#: plugins/builddep.py:204 plugins/builddep.py:224 plugins/builddep.py:241 + msgid "Not all dependencies satisfied" + msgstr "Toutes les dépendances ne sont pas satisfaites" + +-#: plugins/builddep.py:211 ++#: plugins/builddep.py:208 ++msgid "" ++"Warning: -D or --define arguments have no meaning for source rpm packages." ++msgstr "" ++"Attention : les arguments -D ou --define n'ont aucune signification pour les " ++"paquets rpm source." ++ ++#: plugins/builddep.py:215 + #, python-format + msgid "Failed to open: '%s', not a valid spec file: %s" + msgstr "Échec à l’ouverture de « %s », %s n’est pas un fichier spec valide" + +-#: plugins/builddep.py:230 plugins/repoclosure.py:124 ++#: plugins/builddep.py:234 plugins/repoclosure.py:124 + #, python-format + msgid "no package matched: %s" + msgstr "aucun paquet ne correspond à : %s" +@@ -304,11 +311,11 @@ msgstr "Erreur : " + + #: plugins/copr.py:165 + msgid "" +-"specify Copr hub either with `--hub` or using " +-"`copr_hub/copr_username/copr_projectname` format" ++"specify Copr hub either with `--hub` or using `copr_hub/copr_username/" ++"copr_projectname` format" + msgstr "" +-"précisez un hub Copr soit via `--hub` ou en utilisant le format " +-"`hub_copr/utilisateur_copr/projet_copr`" ++"précisez un hub Copr soit via `--hub` ou en utilisant le format `hub_copr/" ++"utilisateur_copr/projet_copr`" + + #: plugins/copr.py:168 + msgid "multiple hubs specified" +@@ -348,7 +355,8 @@ msgid "" + "\n" + "The Fedora Project does not exercise any power over the contents of\n" + "this repository beyond the rules outlined in the Copr FAQ at\n" +-",\n" ++",\n" + "and packages are not held to any quality or security level.\n" + "\n" + "Please do not file bug reports about these packages in Fedora\n" +@@ -360,10 +368,12 @@ msgstr "" + "\n" + "Le projet Fedora n’exerce aucun pouvoir sur le contenu de ce dépôt au delà\n" + "des règles précisées dans la FAQ Copr \n" +-",\n" ++",\n" + "et les paquets ne sont tenus à aucun niveau de qualité ou de sécurité.\n" + "\n" +-"Veuillez ne pas signaler de bogues à propos de ces paquets dans le Bugzilla de Fedora.\n" ++"Veuillez ne pas signaler de bogues à propos de ces paquets dans le Bugzilla " ++"de Fedora.\n" + "En cas de problèmes, contactez le propriétaire de ce dépôt.\n" + + #: plugins/copr.py:297 +@@ -384,8 +394,8 @@ msgstr "Sous-commande inconnue {}." + + #: plugins/copr.py:367 + msgid "" +-"* These coprs have repo file with an old format that contains no information" +-" about Copr hub - the default one was assumed. Re-enable the project to fix " ++"* These coprs have repo file with an old format that contains no information " ++"about Copr hub - the default one was assumed. Re-enable the project to fix " + "this." + msgstr "" + "* Ces Copr ont des fichiers de dépôts avec un ancien format qui ne contient " +@@ -428,16 +438,16 @@ msgstr "Cette commande requiert les privilèges du super utilisateur." + #: plugins/copr.py:487 + #, python-brace-format + msgid "Request to {0} failed: {1} - {2}" +-msgstr "" ++msgstr "La demande à {0} a échoué : {1} - {2}" + + #: plugins/copr.py:489 + msgid "It wasn't possible to enable this project.\n" +-msgstr "" ++msgstr "Il n'a pas été possible d'activer ce projet.\n" + + #: plugins/copr.py:494 + #, python-brace-format + msgid "Repository '{0}' does not exist in project '{1}'." +-msgstr "Le dépôt « {0} » n’existe pas dans le projet « {1} »." ++msgstr "Le référentiel '{0}' n'existe pas dans le projet '{1}'." + + #: plugins/copr.py:497 + msgid "" +@@ -445,7 +455,7 @@ msgid "" + "Available repositories: " + msgstr "" + "\n" +-"Dépôts disponibles : " ++"Dépôts disponibles : " + + #: plugins/copr.py:499 + #, python-brace-format +@@ -456,16 +466,23 @@ msgid "" + " 'dnf copr enable {0} '\n" + "But note that the installed repo file will likely need a manual modification." + msgstr "" ++"\n" ++"\n" ++"Si vous voulez activer un référentiel autre que celui par défaut, utilisez " ++"la commande suivante :\n" ++" 'dnf copr enable {0} '\n" ++"Mais notez que le fichier repo installé devra probablement être modifié " ++"manuellement." + + #: plugins/copr.py:505 + #, python-brace-format + msgid "Project {0} does not exist." +-msgstr "Le projet {0} n’existe pas." ++msgstr "Le projet {0} n'existe pas." + + #: plugins/copr.py:508 + #, python-brace-format + msgid "Failed to connect to {0}: {1}" +-msgstr "Impossible de se connecter à {0} : {1}" ++msgstr "Échec de la connexion à {0} : {1}" + + #: plugins/copr.py:555 + #, python-brace-format +@@ -619,8 +636,7 @@ msgstr "" + msgid "" + "Could not find debugsource package for the following available packages: %s" + msgstr "" +-"Impossible de trouver le paquet debugsource pour ces paquets disponibles : " +-"%s" ++"Impossible de trouver le paquet debugsource pour ces paquets disponibles : %s" + + #: plugins/debuginfo-install.py:190 + #, python-format +@@ -823,8 +839,8 @@ msgstr "Les paquets ne peuvent pas être retirés d'un groupe qui n'existe pas" + + #: plugins/groups_manager.py:307 + msgid "" +-"Group id '{}' generated from '{}' is duplicit. Please specify group id using" +-" --id." ++"Group id '{}' generated from '{}' is duplicit. Please specify group id using " ++"--id." + msgstr "" + "L'id du groupe « {} » qui a été généré pour « {} » est en double. Veuillez " + "le spécifier en utilisant --id." +@@ -917,7 +933,7 @@ msgstr "" + + #: plugins/modulesync.py:166 + msgid "No mach for argument '{}'" +-msgstr "Pas de correspondance pour l'argument '{}'" ++msgstr "Aucune correspondance pour l'argument '{}'" + + #. TODO(jmracek) Shell we end with an error or with RC 1? + #: plugins/modulesync.py:198 +@@ -1005,11 +1021,10 @@ msgid "Display a list of unresolved dependencies for repositories" + msgstr "Affiche une liste de dépendances non résolues pour les dépôts" + + #: plugins/repoclosure.py:69 +-#, fuzzy +-#| msgid "Repoclosure ended with unresolved dependencies." +-msgid "" +-"Repoclosure ended with unresolved dependencies ({}) across {} packages." +-msgstr "Repoclosure a terminé avec des dépendances non-résolues." ++msgid "Repoclosure ended with unresolved dependencies ({}) across {} packages." ++msgstr "" ++"Repoclosure s'est terminé avec des dépendances non résolues ({}) sur {} " ++"paquets." + + #: plugins/repoclosure.py:159 + msgid "check packages of the given archs, can be specified multiple times" +@@ -1055,11 +1070,10 @@ msgstr "Affichez des données supplémentaires sur la taille des changements." + + #: plugins/repodiff.py:69 + msgid "" +-"Compare packages also by arch. By default packages are compared just by " +-"name." ++"Compare packages also by arch. By default packages are compared just by name." + msgstr "" +-"Compare également les paquets par architecture. Par défaut, les paquets sont" +-" uniquement comparés par nom." ++"Compare également les paquets par architecture. Par défaut, les paquets sont " ++"uniquement comparés par nom." + + #: plugins/repodiff.py:72 + msgid "Output a simple one line message for modified packages." +@@ -1187,16 +1201,12 @@ msgid "Pass either --old or --new, not both!" + msgstr "Passez soit --old, soit --new, mais pas les deux !" + + #: plugins/repomanage.py:61 +-#, fuzzy +-#| msgid "Pass either --old or --new, not both!" + msgid "Pass either --oldonly or --new, not both!" +-msgstr "Passez soit --old, soit --new, mais pas les deux !" ++msgstr "Passez soit --oldonly, soit --new, mais pas les deux !" + + #: plugins/repomanage.py:63 +-#, fuzzy +-#| msgid "Pass either --old or --new, not both!" + msgid "Pass either --old or --oldonly, not both!" +-msgstr "Passez soit --old, soit --new, mais pas les deux !" ++msgstr "Passez --old ou --oldonly, mais pas les deux !" + + #: plugins/repomanage.py:100 + msgid "No files to process" +@@ -1211,10 +1221,8 @@ msgid "Print the older packages" + msgstr "Afficher les paquets plus anciens" + + #: plugins/repomanage.py:225 +-#, fuzzy +-#| msgid "Print the newest packages" + msgid "Print the older packages. Exclude the newest packages." +-msgstr "Afficher les paquets les plus récents" ++msgstr "Afficher les anciens paquets. Exclure les paquets les plus récents." + + #: plugins/repomanage.py:227 + msgid "Print the newest packages" +@@ -1260,11 +1268,11 @@ msgstr "également télécharger et décompresser comps.xml" + + #: plugins/reposync.py:75 + msgid "" +-"where to store downloaded repository metadata. Defaults to the value of " +-"--download-path." ++"where to store downloaded repository metadata. Defaults to the value of --" ++"download-path." + msgstr "" +-"là où stocker les métadonnées du dépôt. Prend par défaut la valeur de " +-"--download-path." ++"là où stocker les métadonnées du dépôt. Prend par défaut la valeur de --" ++"download-path." + + #: plugins/reposync.py:78 + msgid "download only newest packages per-repo" +@@ -1339,6 +1347,199 @@ msgstr "comps.xml pour le dépôt %s sauvegardé" + msgid "New leaves:" + msgstr "Nouvelles feuilles :" + ++#. Translators: This string is only used in unit tests. ++#: plugins/system_upgrade.py:45 ++msgid "the color of the sky" ++msgstr "la couleur du ciel" ++ ++#: plugins/system_upgrade.py:57 ++msgid "Need a --releasever greater than the current system version." ++msgstr "Besoin d'un --releasever supérieur à la version actuelle du système." ++ ++#. Translators: do not change "reboot" here ++#: plugins/system_upgrade.py:59 ++#, python-brace-format ++msgid "" ++"Download complete! Use 'dnf {command} reboot' to start the upgrade.\n" ++"To remove cached metadata and transaction use 'dnf {command} clean'" ++msgstr "" ++"Téléchargement terminé ! Utilisez 'dnf {command} reboot' pour démarrer la " ++"mise à jour.\n" ++"Pour supprimer les métadonnées mises en cache et les transactions, utilisez " ++"'dnf {command} clean'’" ++ ++#: plugins/system_upgrade.py:62 ++msgid "Sorry, you need to use 'download --releasever' instead of '--network'" ++msgstr "" ++"Désolé, vous devez utiliser 'download --releasever' au lieu de '--network'’" ++ ++#: plugins/system_upgrade.py:71 ++msgid "Reboot turned off, not rebooting." ++msgstr "Redémarrage désactivé, pas de redémarrage." ++ ++#: plugins/system_upgrade.py:122 ++#, python-format ++msgid "Screen blanking can't be disabled: %s" ++msgstr "L'effacement d'écran ne peut pas être désactivé : %s" ++ ++#: plugins/system_upgrade.py:142 ++#, python-format ++msgid "Failed loading state file: %s, continuing with empty state." ++msgstr "" ++"Échec du chargement du fichier d'état : %s, continuer avec un état vide." ++ ++#: plugins/system_upgrade.py:289 ++msgid "The following boots appear to contain upgrade logs:" ++msgstr "" ++"Les démarrages suivants semblent contenir des journaux de mise à niveau :" ++ ++#: plugins/system_upgrade.py:299 ++msgid "-- no logs were found --" ++msgstr "-- aucun journal n'a été trouvé --" ++ ++#: plugins/system_upgrade.py:314 ++msgid "Cannot find logs with this index." ++msgstr "Impossible de trouver des journaux avec cet index." ++ ++#: plugins/system_upgrade.py:323 ++msgid "Unable to match systemd journal entry" ++msgstr "Impossible de faire correspondre l'entrée du journal de systemd" ++ ++#: plugins/system_upgrade.py:344 ++msgid "Prepare system for upgrade to a new release" ++msgstr "Préparer le système pour la mise à niveau vers une nouvelle version" ++ ++#: plugins/system_upgrade.py:360 ++msgid "keep installed packages if the new release's version is older" ++msgstr "" ++"Conserver les paquets installés si la version de la nouvelle version est " ++"plus ancienne" ++ ++#: plugins/system_upgrade.py:364 ++msgid "which logs to show" ++msgstr "Quels journaux afficher" ++ ++#: plugins/system_upgrade.py:398 ++#, python-brace-format ++msgid "Incompatible version of data. Rerun 'dnf {command} download [OPTIONS]'" ++msgstr "" ++"Version incompatible des données. Relancez 'dnf {command} download " ++"[OPTIONS]'’" ++ ++#: plugins/system_upgrade.py:434 ++msgid "Command 'offline-distrosync' cannot be used with --no-downgrade option" ++msgstr "" ++"La commande 'offline-distrosync' ne peut pas être utilisée avec l'option " ++"--no-downgrade" ++ ++#: plugins/system_upgrade.py:454 ++msgid "" ++"WARNING: this operation is not supported on the RHEL distribution. Proceed " ++"at your own risk." ++msgstr "" ++"AVERTISSEMENT : cette opération n'est pas prise en charge sur la " ++"distribution RHEL. Procédez à vos propres risques." ++ ++#: plugins/system_upgrade.py:458 ++msgid "Additional information for System Upgrade: {}" ++msgstr "Informations supplémentaires pour la mise à niveau du système : {}" ++ ++#: plugins/system_upgrade.py:461 ++msgid "" ++"Before you continue ensure that your system is fully upgraded by running " ++"\"dnf --refresh upgrade\". Do you want to continue" ++msgstr "" ++"Avant de continuer, assurez-vous que votre système est entièrement mis à " ++"jour en exécutant \"dnf --refresh upgrade\". Voulez-vous continuer" ++ ++#: plugins/system_upgrade.py:465 ++msgid "Operation aborted." ++msgstr "Opération avortée." ++ ++#: plugins/system_upgrade.py:526 ++msgid "system is not ready for upgrade" ++msgstr "Le système n'est pas prêt pour la mise à niveau" ++ ++#: plugins/system_upgrade.py:529 ++#, python-brace-format ++msgid "" ++"the transaction was not prepared for '{command}'. Rerun 'dnf {command} " ++"download [OPTIONS]'" ++msgstr "" ++"La transaction n'a pas été préparée pour '{command}'. Relancez 'dnf {command}" ++" download [OPTIONS]'" ++ ++#: plugins/system_upgrade.py:533 ++msgid "upgrade is already scheduled" ++msgstr "la mise à niveau est déjà prévue" ++ ++#: plugins/system_upgrade.py:539 ++msgid "trigger file does not exist. exiting quietly." ++msgstr "Le fichier de déclenchement n'existe pas. Il se termine tranquillement." ++ ++#: plugins/system_upgrade.py:542 ++msgid "another upgrade tool is running. exiting quietly." ++msgstr "" ++"Un autre outil de mise à niveau est en cours d'exécution. il se termine " ++"tranquillement." ++ ++#: plugins/system_upgrade.py:551 ++#, python-brace-format ++msgid "use 'dnf {command} reboot' to begin the upgrade" ++msgstr "Utilisez 'dnf {command} reboot' pour commencer la mise à jour" ++ ++#: plugins/system_upgrade.py:569 ++msgid "Rebooting to perform upgrade." ++msgstr "Redémarrage pour effectuer la mise à niveau." ++ ++#: plugins/system_upgrade.py:602 ++msgid "Starting offline upgrade. This will take a while." ++msgstr "" ++"Je commence la mise à jour hors ligne. Cela va prendre un certain temps." ++ ++#: plugins/system_upgrade.py:604 ++msgid "Starting offline distrosync. This will take a while." ++msgstr "" ++"Démarrage de la distrosync hors ligne. Cela va prendre un certain temps." ++ ++#: plugins/system_upgrade.py:606 ++msgid "Starting system upgrade. This will take a while." ++msgstr "" ++"Je commence la mise à jour du système. Cela va prendre un certain temps." ++ ++#: plugins/system_upgrade.py:622 ++msgid "Cleaning up downloaded data..." ++msgstr "Nettoyage des données téléchargées..." ++ ++#: plugins/system_upgrade.py:652 ++msgid "" ++"The system-upgrade transaction is empty, your system is already up-to-date." ++msgstr "La transaction system-upgrade est vide, votre système est déjà à jour." ++ ++#: plugins/system_upgrade.py:661 ++msgid "Transaction saved to {}." ++msgstr "Transaction enregistrée vers {}." ++ ++#: plugins/system_upgrade.py:664 ++msgid "Error storing transaction: {}" ++msgstr "Erreur lors du stockage de la transaction : {}" ++ ++#: plugins/system_upgrade.py:686 ++msgid "Download finished." ++msgstr "Téléchargement terminé." ++ ++#: plugins/system_upgrade.py:689 plugins/system_upgrade.py:690 ++msgid "Upgrade complete! Cleaning up and rebooting..." ++msgstr "Mise à jour terminée ! Nettoyage et redémarrage..." ++ ++#: plugins/system_upgrade.py:699 ++msgid "Prepare offline upgrade of the system" ++msgstr "Préparer la mise à niveau hors ligne du système" ++ ++#: plugins/system_upgrade.py:704 ++msgid "Prepare offline distrosync of the system" ++msgstr "Préparer la distrosynchronisation hors ligne du système" ++ + #: plugins/versionlock.py:33 + #, python-format + msgid "Unable to read version lock configuration: %s" +@@ -1387,7 +1588,8 @@ msgstr "" + "appliquées : {}" + + #: plugins/versionlock.py:44 +-msgid "Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" ++msgid "" ++"Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" + msgstr "" + "Plugin versionlock : nombre de règles d’exclusion du fichier \"{}\" " + "appliquées : {}" +diff --git a/po/ja.po b/po/ja.po +index 8f7cdd4..60f4a29 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -1,21 +1,23 @@ + # Ooyama Yosiyuki , 2015. #zanata +-# Ludek Janda , 2018. #zanata, 2021. ++# Ludek Janda , 2018. #zanata, 2021, 2023. + # Casey Jones , 2020. +-# Transtats , 2022. ++# Sundeep Anand , 2021. ++# Transtats , 2022, 2023. + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-08-08 02:57+0000\n" +-"PO-Revision-Date: 2022-03-09 12:39+0000\n" +-"Last-Translator: Transtats \n" +-"Language-Team: Japanese \n" ++"POT-Creation-Date: 2023-02-28 12:26+0100\n" ++"PO-Revision-Date: 2023-03-06 13:48+0000\n" ++"Last-Translator: Ludek Janda \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" + "Plural-Forms: nplurals=1; plural=0;\n" +-"X-Generator: Weblate 4.11.2\n" ++"X-Generator: Weblate 4.15.2\n" + + #: plugins/builddep.py:45 + msgid "[PACKAGE|PACKAGE.spec]" +@@ -55,8 +57,7 @@ msgid "Some packages could not be found." + msgstr "一部のパッケージは見つかりませんでした。" + + #. No provides, no files +-#. Richdeps can have no matches but it could be correct (solver must decide +-#. later) ++#. Richdeps can have no matches but it could be correct (solver must decide later) + #: plugins/builddep.py:173 + #, python-format + msgid "No matching package to install: '%s'" +@@ -65,18 +66,25 @@ msgstr "インストール用の一致するパッケージがありません: ' + #: plugins/builddep.py:191 + #, python-format + msgid "Failed to open: '%s', not a valid source rpm file." +-msgstr "開くことに失敗しました: '%s'、有効なソース rpm ファイルではありません。" ++msgstr "" ++"開くことに失敗しました: '%s'、有効なソース rpm ファイルではありません。" + +-#: plugins/builddep.py:204 plugins/builddep.py:220 plugins/builddep.py:237 ++#: plugins/builddep.py:204 plugins/builddep.py:224 plugins/builddep.py:241 + msgid "Not all dependencies satisfied" + msgstr "すべての依存関係が満たされているわけではない" + +-#: plugins/builddep.py:211 ++#: plugins/builddep.py:208 ++msgid "" ++"Warning: -D or --define arguments have no meaning for source rpm packages." ++msgstr "警告: -D または --define 引数には、ソース rpm " ++"パッケージに対する意味はありません。" ++ ++#: plugins/builddep.py:215 + #, python-format + msgid "Failed to open: '%s', not a valid spec file: %s" + msgstr "開くことに失敗しました: '%s'、有効なスペックファイルではありません: %s" + +-#: plugins/builddep.py:230 plugins/repoclosure.py:124 ++#: plugins/builddep.py:234 plugins/repoclosure.py:124 + #, python-format + msgid "no package matched: %s" + msgstr "一致するパッケージはありません: %s" +@@ -94,7 +102,9 @@ msgstr "パッケージの changelog データを表示します" + msgid "" + "show changelog entries since DATE. To avoid ambiguosity, YYYY-MM-DD format " + "is recommended." +-msgstr "DATE 以降の changelog エントリーを表示します。不明瞭さを避けるため、YYYY-MM-DD のフォーマットが推奨されます。" ++msgstr "" ++"DATE 以降の changelog エントリーを表示します。不明瞭さを避けるため、YYYY-MM-" ++"DD のフォーマットが推奨されます。" + + #: plugins/changelog.py:55 + msgid "show given number of changelog entries per package" +@@ -105,7 +115,8 @@ msgid "" + "show only new changelog entries for packages, that provide an upgrade for " + "some of already installed packages." + msgstr "" +-"パッケージ向けの新しい changelog エントリーのみを表示します。これは、インストール済みのパッケージの一部にアップグレードを提供します。" ++"パッケージ向けの新しい changelog エントリーのみを表示します。これは、インス" ++"トール済みのパッケージの一部にアップグレードを提供します。" + + #: plugins/changelog.py:60 + msgid "PACKAGE" +@@ -127,7 +138,9 @@ msgstr[0] "最新の changelog のみを一覧表示します" + + #: plugins/changelog.py:116 + msgid "Listing only new changelogs since installed version of the package" +-msgstr "パッケージのインストールされたバージョン以降の新しい changelogs のみを一覧表示します" ++msgstr "" ++"パッケージのインストールされたバージョン以降の新しい changelogs のみを一覧表" ++"示します" + + #: plugins/changelog.py:118 + msgid "Listing all changelogs" +@@ -179,8 +192,8 @@ msgid "" + "Warning: --enablerepo/--disablerepo arguments have no meaningwith config " + "manager. Use --set-enabled/--set-disabled instead." + msgstr "" +-"警告: --enablerepo/--disablerepo の引数は config manager では意味がありません。代わりに -set-" +-"enabled/--set-disabled を使用してください。" ++"警告: --enablerepo/--disablerepo の引数は config manager では意味がありませ" ++"ん。代わりに -set-enabled/--set-disabled を使用してください。" + + #: plugins/config_manager.py:132 + #, python-format +@@ -262,7 +275,8 @@ msgstr "" + + #: plugins/copr.py:120 + msgid "List all installed Copr repositories (default)" +-msgstr "インストール済みのすべての Copr リポジトリーを一覧表示します (デフォルト)" ++msgstr "" ++"インストール済みのすべての Copr リポジトリーを一覧表示します (デフォルト)" + + #: plugins/copr.py:122 + msgid "List enabled Copr repositories" +@@ -286,11 +300,11 @@ msgstr "エラー: " + + #: plugins/copr.py:165 + msgid "" +-"specify Copr hub either with `--hub` or using " +-"`copr_hub/copr_username/copr_projectname` format" ++"specify Copr hub either with `--hub` or using `copr_hub/copr_username/" ++"copr_projectname` format" + msgstr "" +-"`--hub` または `copr_hub/copr_username/copr_projectname` フォーマットを使って、Copr " +-"ハブを指定します" ++"`--hub` または `copr_hub/copr_username/copr_projectname` フォーマットを使っ" ++"て、Copr ハブを指定します" + + #: plugins/copr.py:168 + msgid "multiple hubs specified" +@@ -308,11 +322,15 @@ msgstr "引数が多すぎます。" + msgid "" + "Bad format of optional chroot. The format is distribution-version-" + "architecture." +-msgstr "オプションの chroot の形式が無効です。正しい形式は distribution-version-architecture です。" ++msgstr "" ++"オプションの chroot の形式が無効です。正しい形式は distribution-version-" ++"architecture です。" + + #: plugins/copr.py:264 + msgid "use format `copr_username/copr_projectname` to reference copr project" +-msgstr "copr プロジェクトを参照するには `copr_username/copr_projectname` 形式を使用します" ++msgstr "" ++"copr プロジェクトを参照するには `copr_username/copr_projectname` 形式を使用し" ++"ます" + + #: plugins/copr.py:266 + msgid "bad copr project format" +@@ -326,7 +344,8 @@ msgid "" + "\n" + "The Fedora Project does not exercise any power over the contents of\n" + "this repository beyond the rules outlined in the Copr FAQ at\n" +-",\n" ++",\n" + "and packages are not held to any quality or security level.\n" + "\n" + "Please do not file bug reports about these packages in Fedora\n" +@@ -334,9 +353,11 @@ msgid "" + msgstr "" + "\n" + "Copr リポジトリーを有効化しています。このリポジトリーは\n" +-"主要ディストリビューションの一部ではないため、品質が一定していない点に注意してください。\n" ++"主要ディストリビューションの一部ではないため、品質が一定していない点に注意し" ++"てください。\n" + "\n" +-"Fedora Project は、このリポジトリーのコンテンツに関して、 の \n" ++"Fedora Project は、このリポジトリーのコンテンツに関して、 の \n" + "Copr FAQ で示されたルールを超えて権利を行使することは\n" + "ありません。また、パッケージは、任意の品質またはセキュリ\n" + "ティーレベルを固守していません。\n" +@@ -362,12 +383,13 @@ msgstr "不明なサブコマンド {}。" + + #: plugins/copr.py:367 + msgid "" +-"* These coprs have repo file with an old format that contains no information" +-" about Copr hub - the default one was assumed. Re-enable the project to fix " ++"* These coprs have repo file with an old format that contains no information " ++"about Copr hub - the default one was assumed. Re-enable the project to fix " + "this." + msgstr "" + "* これらの coprs には、Copr ハブに関する情報がない古いフォーマットの repo " +-"ファイルがあります。デフォルトは仮定です。これを修正するには、プロジェクトを再度有効化してください。" ++"ファイルがあります。デフォルトは仮定です。これを修正するには、プロジェクトを" ++"再度有効化してください。" + + #: plugins/copr.py:380 + msgid "Can't parse repositories for username '{}'." +@@ -404,27 +426,24 @@ msgstr "このコマンドは root ユーザーの下で実行する必要があ + #: plugins/copr.py:487 + #, python-brace-format + msgid "Request to {0} failed: {1} - {2}" +-msgstr "" ++msgstr "{0} へのリクエストに失敗しました: {1} - {2}" + + #: plugins/copr.py:489 + msgid "It wasn't possible to enable this project.\n" +-msgstr "" ++msgstr "このプロジェクトを有効にすることができませんでした。\n" + + #: plugins/copr.py:494 +-#, fuzzy, python-brace-format +-#| msgid "Such repository does not exist." ++#, python-brace-format + msgid "Repository '{0}' does not exist in project '{1}'." +-msgstr "そのようなリポジトリーは存在しません。" ++msgstr "'{0}' リポジトリーはプロジェクト '{1}' に存在しません。" + + #: plugins/copr.py:497 +-#, fuzzy +-#| msgid "List enabled Copr repositories" + msgid "" + "\n" + "Available repositories: " + msgstr "" + "\n" +-"有効化された Copr リポジトリーを一覧表示します " ++"利用可能なリポジトリー: " + + #: plugins/copr.py:499 + #, python-brace-format +@@ -435,18 +454,22 @@ msgid "" + " 'dnf copr enable {0} '\n" + "But note that the installed repo file will likely need a manual modification." + msgstr "" ++"\n" ++"\n" ++"デフォルト以外のリポジトリーを有効にする場合は、以下のコマンドを使用します:\n" ++" 'dnf copr enable {0} '\n" ++"ただし、インストールされているリポジトリーファイルを手動で変更する必要がある" ++"可能性があることに注意してください。" + + #: plugins/copr.py:505 +-#, fuzzy, python-brace-format +-#| msgid "Such repository does not exist." ++#, python-brace-format + msgid "Project {0} does not exist." +-msgstr "そのようなリポジトリーは存在しません。" ++msgstr "プロジェクト {0} は存在しません。" + + #: plugins/copr.py:508 +-#, fuzzy, python-brace-format +-#| msgid "Failed to remove copr repo {0}/{1}/{2}" ++#, python-brace-format + msgid "Failed to connect to {0}: {1}" +-msgstr "copr repo {0}/{1}/{2} の削除に失敗しました" ++msgstr "{0} への接続に失敗しました: {1}" + + #: plugins/copr.py:555 + #, python-brace-format +@@ -466,7 +489,8 @@ msgid "" + msgstr "" + "有効化した Copr リポジトリーの管理者は\n" + "他のリポジトリーに依存するように決めました。\n" +-"そのようなリポジトリーは通常、主な Corp レジストリー(ランタイム依存関係を提供) から RPM を\n" ++"そのようなリポジトリーは通常、主な Corp レジストリー(ランタイム依存関係を提" ++"供) から RPM を\n" + "正常にインストールするために必要です。\n" + "\n" + "上記の品質とバグ報告についての注意点がここでも適用\n" +@@ -551,7 +575,9 @@ msgstr "記録されたパッケージの最新バージョンをインストー + msgid "" + "Ignore architecture and install missing packages matching the name, epoch, " + "version and release." +-msgstr "アーキテクチャーを無視し、名前、エポック、バージョン、およびリリースと一致する不足のパッケージをインストールします。" ++msgstr "" ++"アーキテクチャーを無視し、名前、エポック、バージョン、およびリリースと一致す" ++"る不足のパッケージをインストールします。" + + #: plugins/debug.py:196 + msgid "limit to specified type" +@@ -561,7 +587,9 @@ msgstr "指定したタイプに限定します" + msgid "" + "Allow removing of install-only packages. Using this option may result in an " + "attempt to remove the running kernel." +-msgstr "インストールのみのパッケージの削除を許可します。このオプションを使用すると、実行しているカーネルの削除を試みる可能性があります。" ++msgstr "" ++"インストールのみのパッケージの削除を許可します。このオプションを使用すると、" ++"実行しているカーネルの削除を試みる可能性があります。" + + #: plugins/debug.py:202 + msgid "name of dump file" +@@ -585,25 +613,31 @@ msgstr "debuginfo パッケージのインストール" + #, python-format + msgid "" + "Could not find debuginfo package for the following available packages: %s" +-msgstr "次の利用可能なパッケージの debuginfo パッケージが見つかりませんでした: %s" ++msgstr "" ++"次の利用可能なパッケージの debuginfo パッケージが見つかりませんでした: %s" + + #: plugins/debuginfo-install.py:185 + #, python-format + msgid "" + "Could not find debugsource package for the following available packages: %s" +-msgstr "次の利用可能なパッケージの debugsource パッケージが見つかりませんでした: %s" ++msgstr "" ++"次の利用可能なパッケージの debugsource パッケージが見つかりませんでした: %s" + + #: plugins/debuginfo-install.py:190 + #, python-format + msgid "" + "Could not find debuginfo package for the following installed packages: %s" +-msgstr "次のインストールされたパッケージの debuginfo パッケージが見つかりませんでした: %s" ++msgstr "" ++"次のインストールされたパッケージの debuginfo パッケージが見つかりませんでし" ++"た: %s" + + #: plugins/debuginfo-install.py:195 + #, python-format + msgid "" + "Could not find debugsource package for the following installed packages: %s" +-msgstr "次のインストールされたパッケージの debugsource パッケージが見つかりませんでした: %s" ++msgstr "" ++"次のインストールされたパッケージの debugsource パッケージが見つかりませんでし" ++"た: %s" + + #: plugins/debuginfo-install.py:199 + msgid "Unable to find a match" +@@ -641,12 +675,15 @@ msgstr "必要な依存関係を解決し、ダウンロードします" + msgid "" + "when running with --resolve, download all dependencies (do not exclude " + "already installed ones)" +-msgstr "--resolve で実行する場合、すべての依存関係をダウンロードします (インストール済みのものを除外しないでください)" ++msgstr "" ++"--resolve で実行する場合、すべての依存関係をダウンロードします (インストール" ++"済みのものを除外しないでください)" + + #: plugins/download.py:67 + msgid "" + "print list of urls where the rpms can be downloaded instead of downloading" +-msgstr "ダウンロードする代わりに、rpm をダウンロードできる url の一覧を印刷します" ++msgstr "" ++"ダウンロードする代わりに、rpm をダウンロードできる url の一覧を印刷します" + + #: plugins/download.py:72 + msgid "when running with --url, limit to specific protocols" +@@ -689,7 +726,9 @@ msgstr "翻訳されたデータの無効または空な言語" + + #: plugins/groups_manager.py:71 + msgid "Can't generate group id from '{}'. Please specify group id using --id." +-msgstr "'{}' からグループ ID を生成できません。--id を使用してグループ ID を指定してください。" ++msgstr "" ++"'{}' からグループ ID を生成できません。--id を使用してグループ ID を指定して" ++"ください。" + + #: plugins/groups_manager.py:79 + msgid "create and edit groups metadata file" +@@ -765,7 +804,8 @@ msgstr "パッケージ仕様" + + #: plugins/groups_manager.py:156 + msgid "Can't edit group without specifying it (use --id or --name)" +-msgstr "指定せずにはグループを編集できません (--id または --name を使用してください)" ++msgstr "" ++"指定せずにはグループを編集できません (--id または --name を使用してください)" + + #: plugins/groups_manager.py:190 + msgid "Can't load file \"{}\": {}" +@@ -785,13 +825,16 @@ msgstr "存在しないグループからパッケージを削除できません + + #: plugins/groups_manager.py:307 + msgid "" +-"Group id '{}' generated from '{}' is duplicit. Please specify group id using" +-" --id." +-msgstr "'{}' から生成されたグループ ID '{}' は重複しています。--id を使用してグループ ID を指定してください。" ++"Group id '{}' generated from '{}' is duplicit. Please specify group id using " ++"--id." ++msgstr "" ++"'{}' から生成されたグループ ID '{}' は重複しています。--id を使用してグルー" ++"プ ID を指定してください。" + + #: plugins/leaves.py:32 + msgid "List installed packages not required by any other package" +-msgstr "他のパッケージから必要とされないインスール済みパッケージを一覧表示します" ++msgstr "" ++"他のパッケージから必要とされないインスール済みパッケージを一覧表示します" + + #: plugins/local.py:122 + msgid "Unable to create a directory '{}' due to '{}'" +@@ -824,7 +867,9 @@ msgstr "履歴データを移行中..." + #: plugins/modulesync.py:37 + msgid "" + "Download packages from modules and/or create a repository with modular data" +-msgstr "モジュールからパッケージをダウンロードしたり、モジュラーデータでリポジトリーを作成したりします" ++msgstr "" ++"モジュールからパッケージをダウンロードしたり、モジュラーデータでリポジトリー" ++"を作成したりします" + + #: plugins/modulesync.py:44 + msgid "MODULE" +@@ -840,7 +885,9 @@ msgstr "ソースパッケージを含むリポジトリーを有効にします + + #: plugins/modulesync.py:49 + msgid "enable repositories with debug-info and debug-source packages" +-msgstr "debug-info パッケージおよび debug-source パッケージでリポジトリーを有効にします" ++msgstr "" ++"debug-info パッケージおよび debug-source パッケージでリポジトリーを有効にしま" ++"す" + + #: plugins/modulesync.py:53 + msgid "download only packages from newest modules" +@@ -855,7 +902,9 @@ msgstr[0] "引数に一致するものが見つかりませんでした: '{}'" + msgid "" + "Creation of repository failed with return code {}. All downloaded content " + "was kept on the system" +-msgstr "リポジトリーの作成は戻りコード {} で失敗しました。ダウンロードされたコンテンツはすべてシステムに保持されました" ++msgstr "" ++"リポジトリーの作成は戻りコード {} で失敗しました。ダウンロードされたコンテン" ++"ツはすべてシステムに保持されました" + + #: plugins/modulesync.py:144 + #, python-brace-format +@@ -865,7 +914,9 @@ msgstr "モジュール '{1}' のアーティファクト '{0}' に一致する + #: plugins/modulesync.py:162 + #, python-brace-format + msgid "No match for package name '{0}' in profile {1} from module {2}" +-msgstr "モジュール {2} からのプロファイル {1} のパッケージ名 '{0}' に一致するものはありません" ++msgstr "" ++"モジュール {2} からのプロファイル {1} のパッケージ名 '{0}' に一致するものはあ" ++"りません" + + #: plugins/modulesync.py:166 + msgid "No mach for argument '{}'" +@@ -882,8 +933,8 @@ msgid "" + "No installed package found for package name \"{pkg}\" specified in needs-" + "restarting file \"{file}\"." + msgstr "" +-"needs-restarting ファイル \"{file}\" に指定されている \"{pkg}\" " +-"というパッケージのインストール済みパッケージが見つかりません。" ++"needs-restarting ファイル \"{file}\" に指定されている \"{pkg}\" というパッ" ++"ケージのインストール済みパッケージが見つかりません。" + + #: plugins/needs_restarting.py:220 + msgid "determine updated binaries that need restarting" +@@ -896,7 +947,8 @@ msgstr "このユーザーのプロセスのみを検討します" + #: plugins/needs_restarting.py:227 + msgid "" + "only report whether a reboot is required (exit code 1) or not (exit code 0)" +-msgstr "再起動が必要か (終了コード 1) 必要でないか (終了コード 0) のみを報告します" ++msgstr "" ++"再起動が必要か (終了コード 1) 必要でないか (終了コード 0) のみを報告します" + + #: plugins/needs_restarting.py:230 + msgid "only report affected systemd services" +@@ -916,7 +968,8 @@ msgstr "詳細情報:" + + #: plugins/needs_restarting.py:263 + msgid "No core libraries or services have been updated since boot-up." +-msgstr "起動以降にアップデートされたコアライブラリーまたはサービスはありません。" ++msgstr "" ++"起動以降にアップデートされたコアライブラリーまたはサービスはありません。" + + #: plugins/needs_restarting.py:265 + msgid "Reboot should not be necessary." +@@ -949,11 +1002,9 @@ msgid "Display a list of unresolved dependencies for repositories" + msgstr "リポジトリーの未解決の依存関係の一覧を表示します" + + #: plugins/repoclosure.py:69 +-#, fuzzy +-#| msgid "Repoclosure ended with unresolved dependencies." +-msgid "" +-"Repoclosure ended with unresolved dependencies ({}) across {} packages." +-msgstr "repoclosure は未解決の依存関係で終了しました。" ++msgid "Repoclosure ended with unresolved dependencies ({}) across {} packages." ++msgstr "" ++"Repoclosure は、{} パッケージで依存関係 ({}) が解決されずに終了します。" + + #: plugins/repoclosure.py:159 + msgid "check packages of the given archs, can be specified multiple times" +@@ -987,7 +1038,9 @@ msgstr "新しいリポジトリーを指定します、これは複数回使用 + msgid "" + "Specify architectures to compare, can be used multiple times. By default, " + "only source rpms are compared." +-msgstr "比較するアーキテクチャーを指定します、これは複数回使用できます。デフォルトで、ソース rpms のみが比較されます。" ++msgstr "" ++"比較するアーキテクチャーを指定します、これは複数回使用できます。デフォルト" ++"で、ソース rpms のみが比較されます。" + + #: plugins/repodiff.py:67 + msgid "Output additional data about the size of the changes." +@@ -995,9 +1048,10 @@ msgstr "変更サイズに関する追加データを出力します。" + + #: plugins/repodiff.py:69 + msgid "" +-"Compare packages also by arch. By default packages are compared just by " +-"name." +-msgstr "パッケージを Arch でも比較します。デフォルトで、パッケージは名前のみで比較されます。" ++"Compare packages also by arch. By default packages are compared just by name." ++msgstr "" ++"パッケージを Arch でも比較します。デフォルトで、パッケージは名前のみで比較さ" ++"れます。" + + #: plugins/repodiff.py:72 + msgid "Output a simple one line message for modified packages." +@@ -1007,7 +1061,9 @@ msgstr "変更されたパッケージに簡単な 1 行メッセージを出力 + msgid "" + "Split the data for modified packages between upgraded and downgraded " + "packages." +-msgstr "アップグレードされたパッケージとダウングレードされたパッケージとの間で、変更されたパッケージのデータを分割します。" ++msgstr "" ++"アップグレードされたパッケージとダウングレードされたパッケージとの間で、変更" ++"されたパッケージのデータを分割します。" + + #: plugins/repodiff.py:86 + msgid "Both old and new repositories must be set." +@@ -1120,19 +1176,15 @@ msgstr "rpm パッケージのディレクトリーを管理します" + + #: plugins/repomanage.py:59 + msgid "Pass either --old or --new, not both!" +-msgstr "--old または --new のいずれかを渡します。両方ではありません。" ++msgstr "--old または --new のいずれかを渡します、両方ではありません!" + + #: plugins/repomanage.py:61 +-#, fuzzy +-#| msgid "Pass either --old or --new, not both!" + msgid "Pass either --oldonly or --new, not both!" +-msgstr "--old または --new のいずれかを渡します。両方ではありません。" ++msgstr "--oldonly または --new のいずれかを渡します、両方ではありません!" + + #: plugins/repomanage.py:63 +-#, fuzzy +-#| msgid "Pass either --old or --new, not both!" + msgid "Pass either --old or --oldonly, not both!" +-msgstr "--old または --new のいずれかを渡します。両方ではありません。" ++msgstr "--old または --oldonly のいずれかを渡します、両方ではありません!" + + #: plugins/repomanage.py:100 + msgid "No files to process" +@@ -1147,10 +1199,8 @@ msgid "Print the older packages" + msgstr "古いパッケージを印刷します" + + #: plugins/repomanage.py:225 +-#, fuzzy +-#| msgid "Print the newest packages" + msgid "Print the older packages. Exclude the newest packages." +-msgstr "最新のパッケージを印刷します" ++msgstr "古いパッケージを出力します。最新のパッケージを除外します。" + + #: plugins/repomanage.py:227 + msgid "Print the newest packages" +@@ -1194,9 +1244,11 @@ msgstr "comps.xml もダウンロードして展開します" + + #: plugins/reposync.py:75 + msgid "" +-"where to store downloaded repository metadata. Defaults to the value of " +-"--download-path." +-msgstr "ダウンロード済みリポジトリーメタデータの保管場所。初期値は --download-path です。" ++"where to store downloaded repository metadata. Defaults to the value of --" ++"download-path." ++msgstr "" ++"ダウンロード済みリポジトリーメタデータの保管場所。初期値は --download-path で" ++"す。" + + #: plugins/reposync.py:78 + msgid "download only newest packages per-repo" +@@ -1220,7 +1272,9 @@ msgstr "ソースパッケージのみをダウンロード" + + #: plugins/reposync.py:89 + msgid "Just list urls of what would be downloaded, don't download" +-msgstr "ダウンロードする予定のものの URL をリストするだけで、ダウンロードしないでください" ++msgstr "" ++"ダウンロードする予定のものの URL をリストするだけで、ダウンロードしないでくだ" ++"さい" + + #: plugins/reposync.py:113 + msgid "Can't use --norepopath with multiple repositories" +@@ -1264,7 +1318,188 @@ msgstr "リポジトリー %s の comps.xml が保存されました" + + #: plugins/show_leaves.py:54 + msgid "New leaves:" +-msgstr "新規のリーフパッケージ (他のパッケージから依存されていないパッケージ) :" ++msgstr "" ++"新規のリーフパッケージ (他のパッケージから依存されていないパッケージ) :" ++ ++#. Translators: This string is only used in unit tests. ++#: plugins/system_upgrade.py:45 ++msgid "the color of the sky" ++msgstr "Sky の色" ++ ++#: plugins/system_upgrade.py:57 ++msgid "Need a --releasever greater than the current system version." ++msgstr "現在のシステムバージョンよりも大きい --releasever が必要です。" ++ ++#. Translators: do not change "reboot" here ++#: plugins/system_upgrade.py:59 ++#, python-brace-format ++msgid "" ++"Download complete! Use 'dnf {command} reboot' to start the upgrade.\n" ++"To remove cached metadata and transaction use 'dnf {command} clean'" ++msgstr "" ++"ダウンロードが完了しました! 'dnf {command} reboot' " ++"を使用して､アップグレードを開始します｡\n" ++"キャッシュしたメタデータやトランザクションを削除するには､'dnf {command} " ++"clean' を使用します』" ++ ++#: plugins/system_upgrade.py:62 ++msgid "Sorry, you need to use 'download --releasever' instead of '--network'" ++msgstr "申し訳ございません｡'--network' の代わりに 'download --releasever' " ++"を使用する必要があります』" ++ ++#: plugins/system_upgrade.py:71 ++msgid "Reboot turned off, not rebooting." ++msgstr "再起動ではなく、再起動をオフにしました。" ++ ++#: plugins/system_upgrade.py:122 ++#, python-format ++msgid "Screen blanking can't be disabled: %s" ++msgstr "空白の画面は無効にできません: %s" ++ ++#: plugins/system_upgrade.py:142 ++#, python-format ++msgid "Failed loading state file: %s, continuing with empty state." ++msgstr "状態ファイルの読み込みに失敗: %s､空の状態で続行。" ++ ++#: plugins/system_upgrade.py:289 ++msgid "The following boots appear to contain upgrade logs:" ++msgstr "以下のブートには、アップグレードログが含まれているように見えます:" ++ ++#: plugins/system_upgrade.py:299 ++msgid "-- no logs were found --" ++msgstr "-- ログが見つかりませんでした --" ++ ++#: plugins/system_upgrade.py:314 ++msgid "Cannot find logs with this index." ++msgstr "このインデックスのログが見つかりません。" ++ ++#: plugins/system_upgrade.py:323 ++msgid "Unable to match systemd journal entry" ++msgstr "systemd ジャーナルエントリーにマッチできない" ++ ++#: plugins/system_upgrade.py:344 ++msgid "Prepare system for upgrade to a new release" ++msgstr "新しいリリースへのアップグレードに向けたシステムの準備" ++ ++#: plugins/system_upgrade.py:360 ++msgid "keep installed packages if the new release's version is older" ++msgstr "新しいリリースのバージョンが古い場合は、インストール済みパッケージを維持しま" ++"す" ++ ++#: plugins/system_upgrade.py:364 ++msgid "which logs to show" ++msgstr "表示するログ" ++ ++#: plugins/system_upgrade.py:398 ++#, python-brace-format ++msgid "Incompatible version of data. Rerun 'dnf {command} download [OPTIONS]'" ++msgstr "互換性のないバージョンのデータ。'dnf {command} download [OPTIONS]' " ++"を再実行します』" ++ ++#: plugins/system_upgrade.py:434 ++msgid "Command 'offline-distrosync' cannot be used with --no-downgrade option" ++msgstr "コマンド 'offline-distrosync' は --no-downgrade オプションと併用できません" ++ ++#: plugins/system_upgrade.py:454 ++msgid "" ++"WARNING: this operation is not supported on the RHEL distribution. Proceed " ++"at your own risk." ++msgstr "警告: この操作は RHEL ディストリビューションではサポートされていません。自己" ++"責任で続行してください。" ++ ++#: plugins/system_upgrade.py:458 ++msgid "Additional information for System Upgrade: {}" ++msgstr "システムアップグレードの追加情報: {}" ++ ++#: plugins/system_upgrade.py:461 ++msgid "" ++"Before you continue ensure that your system is fully upgraded by running " ++"\"dnf --refresh upgrade\". Do you want to continue" ++msgstr "続行する前に、dnf --refresh upgrade を実行して、システムが完全にアップグレー" ++"ドされていることを確認します。続行しますか" ++ ++#: plugins/system_upgrade.py:465 ++msgid "Operation aborted." ++msgstr "操作が中断されました。" ++ ++#: plugins/system_upgrade.py:526 ++msgid "system is not ready for upgrade" ++msgstr "システムがアップグレードの準備ができていません" ++ ++#: plugins/system_upgrade.py:529 ++#, python-brace-format ++msgid "" ++"the transaction was not prepared for '{command}'. Rerun 'dnf {command} " ++"download [OPTIONS]'" ++msgstr "" ++"トランザクションは '{command}' に対して準備されていません。'dnf {command} " ++"download [OPTIONS]' を再実行します』" ++ ++#: plugins/system_upgrade.py:533 ++msgid "upgrade is already scheduled" ++msgstr "アップグレードはすでにスケジュールされています" ++ ++#: plugins/system_upgrade.py:539 ++msgid "trigger file does not exist. exiting quietly." ++msgstr "トリガーファイルは存在しません。間もなく終了します。" ++ ++#: plugins/system_upgrade.py:542 ++msgid "another upgrade tool is running. exiting quietly." ++msgstr "別のアップグレードツールが実行中で、警告なしで終了します。" ++ ++#: plugins/system_upgrade.py:551 ++#, python-brace-format ++msgid "use 'dnf {command} reboot' to begin the upgrade" ++msgstr "'dnf {command} reboot' を使用してアップグレードを開始します" ++ ++#: plugins/system_upgrade.py:569 ++msgid "Rebooting to perform upgrade." ++msgstr "再起動してアップグレードを実行します。" ++ ++#: plugins/system_upgrade.py:602 ++msgid "Starting offline upgrade. This will take a while." ++msgstr "オフラインアップグレードの開始。これには時間がかかります。" ++ ++#: plugins/system_upgrade.py:604 ++msgid "Starting offline distrosync. This will take a while." ++msgstr "オフラインの distrosync の開始。これには時間がかかります。" ++ ++#: plugins/system_upgrade.py:606 ++msgid "Starting system upgrade. This will take a while." ++msgstr "システムのアップグレードを開始します。これには時間がかかります。" ++ ++#: plugins/system_upgrade.py:622 ++msgid "Cleaning up downloaded data..." ++msgstr "ダウンロードしたデータのクリーンアップ中..." ++ ++#: plugins/system_upgrade.py:652 ++msgid "" ++"The system-upgrade transaction is empty, your system is already up-to-date." ++msgstr "システムアップグレードトランザクションは空で、システムはすでに最新です。" ++ ++#: plugins/system_upgrade.py:661 ++msgid "Transaction saved to {}." ++msgstr "{} に保存されているトランザクション。" ++ ++#: plugins/system_upgrade.py:664 ++msgid "Error storing transaction: {}" ++msgstr "トランザクションの保存エラー： {}" ++ ++#: plugins/system_upgrade.py:686 ++msgid "Download finished." ++msgstr "ダウンロードが完了しました。" ++ ++#: plugins/system_upgrade.py:689 plugins/system_upgrade.py:690 ++msgid "Upgrade complete! Cleaning up and rebooting..." ++msgstr "アップグレードの完了! クリーンアップおよび再起動を行っています..." ++ ++#: plugins/system_upgrade.py:699 ++msgid "Prepare offline upgrade of the system" ++msgstr "システムのオフラインアップグレードの準備" ++ ++#: plugins/system_upgrade.py:704 ++msgid "Prepare offline distrosync of the system" ++msgstr "システムのオフラインの distrosync を準備します" + + #: plugins/versionlock.py:33 + #, python-format +@@ -1312,7 +1547,8 @@ msgid "Versionlock plugin: number of lock rules from file \"{}\" applied: {}" + msgstr "versionlock プラグイン: ファイル \"{}\" のロックルールの数を適用: {}" + + #: plugins/versionlock.py:44 +-msgid "Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" ++msgid "" ++"Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" + msgstr "versionlock プラグイン: ファイル \"{}\" の除外ルールの数を適用: {}" + + #: plugins/versionlock.py:45 +@@ -1329,11 +1565,14 @@ msgstr "パッケージ仕様をそのまま使用し、解析を試みないで + + #: plugins/versionlock.py:164 + msgid "Subcommand '{}' is deprecated. Use 'exclude' subcommand instead." +-msgstr "サブコマンド '{}' は非推奨になりました。代わりに 'exclude' サブコマンドを使用してください。" ++msgstr "" ++"サブコマンド '{}' は非推奨になりました。代わりに 'exclude' サブコマンドを使用" ++"してください。" + + #~ msgid "" + #~ "This repository does not have any builds yet so you cannot enable it now." +-#~ msgstr "このリポジトリーにはまだビルドがありませんので、今すぐ有効化できません。" ++#~ msgstr "" ++#~ "このリポジトリーにはまだビルドがありませんので、今すぐ有効化できません。" + + #~ msgid "" + #~ "\n" +diff --git a/po/ko.po b/po/ko.po +index d799e98..6b77d34 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -1,22 +1,22 @@ + # Ludek Janda , 2018. #zanata, 2020. +-# Marek Blaha , 2020. +-# simmon , 2021, 2022. ++# simmon , 2021. + # Kim InSoo , 2022. +-# 김인수 , 2022. ++# 김인수 , 2022, 2023. + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-08-08 02:57+0000\n" +-"PO-Revision-Date: 2022-07-21 10:36+0000\n" ++"POT-Creation-Date: 2023-02-28 12:26+0100\n" ++"PO-Revision-Date: 2023-03-03 04:20+0000\n" + "Last-Translator: 김인수 \n" +-"Language-Team: Korean \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: Weblate 4.13\n" ++"X-Generator: Weblate 4.15.2\n" + + #: plugins/builddep.py:45 + msgid "[PACKAGE|PACKAGE.spec]" +@@ -37,7 +37,7 @@ msgstr "특정한 파일 구문분석을 위해 매크로를 정의한다" + + #: plugins/builddep.py:95 + msgid "skip build dependencies not available in repositories" +-msgstr "저장소에서 사용 할 수 없는 구성 의존성을 건너띄기 한다" ++msgstr "저장소에서 사용 할 수 없는 구성 의존성을 건너 뛰기 한다" + + #: plugins/builddep.py:98 + msgid "treat commandline arguments as spec files" +@@ -56,8 +56,7 @@ msgid "Some packages could not be found." + msgstr "몇몇 꾸러미를 찾을 수 없습니다." + + #. No provides, no files +-#. Richdeps can have no matches but it could be correct (solver must decide +-#. later) ++#. Richdeps can have no matches but it could be correct (solver must decide later) + #: plugins/builddep.py:173 + #, python-format + msgid "No matching package to install: '%s'" +@@ -68,16 +67,22 @@ msgstr "설치: '%s' 꾸러미가 일치하지 않습니다" + msgid "Failed to open: '%s', not a valid source rpm file." + msgstr "여는데 실패하였습니다: '%s', 유효한 rpm 파일 출처가 아닙니다." + +-#: plugins/builddep.py:204 plugins/builddep.py:220 plugins/builddep.py:237 ++#: plugins/builddep.py:204 plugins/builddep.py:224 plugins/builddep.py:241 + msgid "Not all dependencies satisfied" + msgstr "모든 의존성을 만족하지 않습니다" + +-#: plugins/builddep.py:211 ++#: plugins/builddep.py:208 ++msgid "" ++"Warning: -D or --define arguments have no meaning for source rpm packages." ++msgstr "경고: -D 또는 --define 인수는 원천 rpm 꾸러미를 위해 의미를 가지고 있지 " ++"않습니다." ++ ++#: plugins/builddep.py:215 + #, python-format + msgid "Failed to open: '%s', not a valid spec file: %s" + msgstr "여는데 실패하였습니다 '%s', 지정한 파일: %s가 유효하지 않습니다" + +-#: plugins/builddep.py:230 plugins/repoclosure.py:124 ++#: plugins/builddep.py:234 plugins/repoclosure.py:124 + #, python-format + msgid "no package matched: %s" + msgstr "일치하는 꾸러미 없음: %s" +@@ -95,7 +100,9 @@ msgstr "꾸러미의 변화 기록자료를 보여줍니다" + msgid "" + "show changelog entries since DATE. To avoid ambiguosity, YYYY-MM-DD format " + "is recommended." +-msgstr "DATE 이후에 변화기록를 보여줍니다. 모호함을 피하기 위하여, YYYY-MM-DD 형식을 추천합니다." ++msgstr "" ++"DATE 이후에 변화기록를 보여줍니다. 모호함을 피하기 위하여, YYYY-MM-DD 형식을 " ++"추천합니다." + + #: plugins/changelog.py:55 + msgid "show given number of changelog entries per package" +@@ -105,7 +112,9 @@ msgstr "주어진 수의 꾸러미 마다 변화기록 항목을 보여줍니다 + msgid "" + "show only new changelog entries for packages, that provide an upgrade for " + "some of already installed packages." +-msgstr "몇몇 이미 설치된 꾸러미들의 최신화를 제공하는 꾸러미를 위하여 새로운 변화기록만을 보여줍니다." ++msgstr "" ++"몇몇 이미 설치된 꾸러미들의 최신화를 제공하는 꾸러미를 위하여 새로운 변화기록" ++"만을 보여줍니다." + + #: plugins/changelog.py:60 + msgid "PACKAGE" +@@ -179,8 +188,8 @@ msgid "" + "Warning: --enablerepo/--disablerepo arguments have no meaningwith config " + "manager. Use --set-enabled/--set-disabled instead." + msgstr "" +-"경고: -- --enablerepo/--disablerepo 인수는 설정 관리자와 함께 의미를 갖고 있지 않습니다. 대신에 --set-" +-"enabled/--set-disabled를 사용하세요." ++"경고: -- --enablerepo/--disablerepo 인수는 설정 관리자와 함께 의미를 갖고 있" ++"지 않습니다. 대신에 --set-enabled/--set-disabled를 사용하세요." + + #: plugins/config_manager.py:132 + #, python-format +@@ -200,7 +209,7 @@ msgstr[0] "저장소 구성에 실패했습니다" + #: plugins/config_manager.py:217 + #, python-format + msgid "Could not save repo to repofile %s: %s" +-msgstr "repofile에 repo를 저장할 수 없습니다. %s: %s" ++msgstr "repofile에 repo를 저장 할 수 없습니다. %s: %s" + + #: plugins/copr.py:70 + msgid "y" +@@ -286,11 +295,11 @@ msgstr "오류: " + + #: plugins/copr.py:165 + msgid "" +-"specify Copr hub either with `--hub` or using " +-"`copr_hub/copr_username/copr_projectname` format" ++"specify Copr hub either with `--hub` or using `copr_hub/copr_username/" ++"copr_projectname` format" + msgstr "" +-"Corp hub를 `--hub` 또는 사용하기 `copr_hub/copr_username/copr_projectname`형식으로 " +-"지정합니다" ++"Corp hub를 `--hub` 또는 사용하기 `copr_hub/copr_username/copr_projectname`형" ++"식으로 지정합니다" + + #: plugins/copr.py:168 + msgid "multiple hubs specified" +@@ -312,7 +321,9 @@ msgstr "선택적인 chroot의 나쁜 형식. 형식은 배포-버전-구조입 + + #: plugins/copr.py:264 + msgid "use format `copr_username/copr_projectname` to reference copr project" +-msgstr "copr 프로젝트를 참조하기 위해`copr_username / copr_projectname` 형식을 사용하십시오" ++msgstr "" ++"copr 프로젝트를 참조하기 위해`copr_username / copr_projectname` 형식을 사용하" ++"십시오" + + #: plugins/copr.py:266 + msgid "bad copr project format" +@@ -326,19 +337,23 @@ msgid "" + "\n" + "The Fedora Project does not exercise any power over the contents of\n" + "this repository beyond the rules outlined in the Copr FAQ at\n" +-",\n" ++",\n" + "and packages are not held to any quality or security level.\n" + "\n" + "Please do not file bug reports about these packages in Fedora\n" + "Bugzilla. In case of problems, contact the owner of this repository.\n" + msgstr "" + "\n" +-"Core 저정소를 활성화합니다. 이 저장소는 주요 배포판 부분이 아님을 알고 있기 바라고,\n" ++"Core 저정소를 활성화합니다. 이 저장소는 주요 배포판 부분이 아님을 알고 있기 " ++"바라고,\n" + "품질이 다를 수 있습니다.\n" + "\n" + "페도라 프로젝트는\n" +-"에\n" +-"Core FAQ에 있는 설명된 규칙을 넘는 저장소 내용 이상의 권한을 시험하지 않으며,\n" ++"에\n" ++"Core FAQ에 있는 설명된 규칙을 넘는 저장소 내용 이상의 권한을 시험하지 않으" ++"며,\n" + "그리고 꾸러미(package)는 어떤 품질이나 보안 수준을 유지하지 않습니다.\n" + "\n" + "페도라 버그질라에 이들 꾸러미에 대한 파일 결점 보고를 제출하지 마세요.\n" +@@ -362,12 +377,12 @@ msgstr "알 수없는 부속 명령 {}." + + #: plugins/copr.py:367 + msgid "" +-"* These coprs have repo file with an old format that contains no information" +-" about Copr hub - the default one was assumed. Re-enable the project to fix " ++"* These coprs have repo file with an old format that contains no information " ++"about Copr hub - the default one was assumed. Re-enable the project to fix " + "this." + msgstr "" +-"* 이들 coprs은 Copr hub에 대하여 어떤 정보도 포함하지 않는 오래된 형태의 저장소 파일을 갖고 있습니다. 이 문제를 수정하기" +-" 위하여 프로젝트를 재활성화하세요." ++"* 이들 coprs은 Copr hub에 대하여 어떤 정보도 포함하지 않는 오래된 형태의 저장" ++"소 파일을 갖고 있습니다. 이 문제를 수정하기 위하여 프로젝트를 재활성화하세요." + + #: plugins/copr.py:380 + msgid "Can't parse repositories for username '{}'." +@@ -408,12 +423,12 @@ msgstr "{0}에 대한 요청이 실패함: {1} - {2}" + + #: plugins/copr.py:489 + msgid "It wasn't possible to enable this project.\n" +-msgstr "이 프로젝트는 활성화 할 수 없습니다.\n" ++msgstr "이와 같은 프로젝트를 활성화 할 수 없습니다.\n" + + #: plugins/copr.py:494 + #, python-brace-format + msgid "Repository '{0}' does not exist in project '{1}'." +-msgstr "저장소 '{0}'는 프로젝트 '{1}'에서 존재하지 않습니다." ++msgstr "저장소 '{0}'는 프로젝트 '{1}'에 존재하지 않습니다." + + #: plugins/copr.py:497 + msgid "" +@@ -421,7 +436,7 @@ msgid "" + "Available repositories: " + msgstr "" + "\n" +-"사용 가능한 저장소 목록: " ++"사용 가능한 저장소: " + + #: plugins/copr.py:499 + #, python-brace-format +@@ -434,19 +449,21 @@ msgid "" + msgstr "" + "\n" + "\n" +-"만약 기본설정되지 않은 저장소를 활성화 하고자 한다면, 다음 명령을 사용하세요:\n" +-" 'dnf copr enable {0} '\n" +-"하지만 설치된 저장소 파일은 수동으로 수정해야 할 필요가 있다는 점을 참고하세요." ++"만약 기본설정되지 않은 저장소를 활성화 하고자 한다면, 다음 명령을 사용하세" ++"요: \n" ++" 'dnf copr enable {0} ' \n" ++"하지만 설치된 저장소 파일은 수동으로 수정해야 할 필요가 있다는 점을 참고하세" ++"요." + + #: plugins/copr.py:505 + #, python-brace-format + msgid "Project {0} does not exist." +-msgstr "프로젝트 {0}는 존재하지 않습니다." ++msgstr "프로젝트 {0}가 존재하지 않습니다." + + #: plugins/copr.py:508 + #, python-brace-format + msgid "Failed to connect to {0}: {1}" +-msgstr "{0}: {1}로 연결 하는데 실패하였습니다" ++msgstr "연결 하는데 실패함 {0}: {1}" + + #: plugins/copr.py:555 + #, python-brace-format +@@ -551,7 +568,9 @@ msgstr "기록 된 꾸러미의 최신 버전을 설치하십시오." + msgid "" + "Ignore architecture and install missing packages matching the name, epoch, " + "version and release." +-msgstr "구조를 무시하고 이름, 기원, 버전및 출시와 일치하는 누락 된 꾸러미를 설치하십시오." ++msgstr "" ++"구조를 무시하고 이름, 기원, 버전및 출시와 일치하는 누락 된 꾸러미를 설치하십" ++"시오." + + #: plugins/debug.py:196 + msgid "limit to specified type" +@@ -561,7 +580,9 @@ msgstr "특정 유형으로 제한" + msgid "" + "Allow removing of install-only packages. Using this option may result in an " + "attempt to remove the running kernel." +-msgstr "설치전용 꾸리미 제거를 허용합니다. 이 선택의 사용은 동작하고 있는 커널을 제거하는 결과가 나타날 수 있습니다." ++msgstr "" ++"설치전용 꾸리미 제거를 허용합니다. 이 선택의 사용은 동작하고 있는 커널을 제거" ++"하는 결과가 나타날 수 있습니다." + + #: plugins/debug.py:202 + msgid "name of dump file" +@@ -585,7 +606,8 @@ msgstr "디버그정보 꾸러미 설치" + #, python-format + msgid "" + "Could not find debuginfo package for the following available packages: %s" +-msgstr "다음 사용가능한 꾸러미를 위하여 디버그정보 꾸러미를 찾을 수 없습니다: %s" ++msgstr "" ++"다음 사용가능한 꾸러미를 위하여 디버그정보 꾸러미를 찾을 수 없습니다: %s" + + #: plugins/debuginfo-install.py:185 + #, python-format +@@ -641,7 +663,9 @@ msgstr "필요한 종속성을 해결하고 내려받아요" + msgid "" + "when running with --resolve, download all dependencies (do not exclude " + "already installed ones)" +-msgstr "--resolve 와 함께 실행 할 때에, 모든 의존성을 내려받습니다 (이미 설치된 것들은 포함하지 않습니다)" ++msgstr "" ++"--resolve 와 함께 실행 할 때에, 모든 의존성을 내려받습니다 (이미 설치된 것들" ++"은 포함하지 않습니다)" + + #: plugins/download.py:67 + msgid "" +@@ -689,11 +713,13 @@ msgstr "번역된 자료가 유효하지 않음/비워짐" + + #: plugins/groups_manager.py:71 + msgid "Can't generate group id from '{}'. Please specify group id using --id." +-msgstr "'{}' 에서 그룹 id를 발생 할 수 없습니다. --id를 사용하여 그룹 id를 지정해 주세요." ++msgstr "" ++"'{}' 에서 그룹 id를 발생 할 수 없습니다. --id를 사용하여 그룹 id를 지정해 주" ++"세요." + + #: plugins/groups_manager.py:79 + msgid "create and edit groups metadata file" +-msgstr "그룹 메타데이타 파일 생성하고 수정합니다" ++msgstr "그룹 메타자료 파일을 생성하고 수정합니다" + + #: plugins/groups_manager.py:90 + msgid "load groups metadata from file" +@@ -709,7 +735,7 @@ msgstr "그룹 메타파일을 파일에 적재하고 저장합니다" + + #: plugins/groups_manager.py:97 + msgid "print the result metadata to stdout" +-msgstr "결과 메타데이타를 표준출력으로 출력한다" ++msgstr "결과 메타자료를 표준출력에 출력합니다" + + #: plugins/groups_manager.py:100 + msgid "group id" +@@ -785,9 +811,11 @@ msgstr "존재하지 않는 그룹에서 꾸러미를 제거 할 수 없습니 + + #: plugins/groups_manager.py:307 + msgid "" +-"Group id '{}' generated from '{}' is duplicit. Please specify group id using" +-" --id." +-msgstr "'{}'에서 발생한 그룹 id '{}'는 중복되었습니다. --id를 사용하여 그룹 id를 지정하기 바랍니다." ++"Group id '{}' generated from '{}' is duplicit. Please specify group id using " ++"--id." ++msgstr "" ++"'{}'에서 발생한 그룹 id '{}'는 중복되었습니다. --id를 사용하여 그룹 id를 지정" ++"하기 바랍니다." + + #: plugins/leaves.py:32 + msgid "List installed packages not required by any other package" +@@ -824,23 +852,24 @@ msgstr "기록 데이터 마이그레이션 중 ..." + #: plugins/modulesync.py:37 + msgid "" + "Download packages from modules and/or create a repository with modular data" +-msgstr "모듈에서 꾸러미를 내려 받기와/또는 모듈식 자료를 갖고 있는 저장소를 생성" ++msgstr "" ++"모듈에서 꾸러미를 내려 받기와/또는 모듈식 자료를 갖고 있는 저장소를 생성" + + #: plugins/modulesync.py:44 + msgid "MODULE" +-msgstr "모듈" ++msgstr "MODULE" + + #: plugins/modulesync.py:45 + msgid "modules to download" +-msgstr "내려받아야 할 모듈" ++msgstr "내려받기 할 모듈" + + #: plugins/modulesync.py:47 + msgid "enable repositories with source packages" +-msgstr "원천 꾸러미와 함께 저장소를 활성화" ++msgstr "원천 꾸러미로 저장소 활성화" + + #: plugins/modulesync.py:49 + msgid "enable repositories with debug-info and debug-source packages" +-msgstr "디버그-정보와 디버그-원천 꾸러미와 함께 저장소 활성화" ++msgstr "debug-info와 debug-source 꾸러미로 저장소 활성화" + + #: plugins/modulesync.py:53 + msgid "download only packages from newest modules" +@@ -849,27 +878,30 @@ msgstr "최신 모듈에서 꾸러미만 내려받기" + #: plugins/modulesync.py:85 + msgid "Unable to find a match for argument: '{}'" + msgid_plural "Unable to find a match for arguments: '{}'" +-msgstr[0] "인수와 일치하는 항목을 찾을 수 없습니다: '{}'" ++msgstr[0] "인수와 일치 항목을 찾을 수 없음: '{}'" + + #: plugins/modulesync.py:107 + msgid "" + "Creation of repository failed with return code {}. All downloaded content " + "was kept on the system" +-msgstr "반환 코드 {}로 인하여 저장소 생성에 실패함. 모두 내려받기된 내용은 시스템에서 보관됩니다" ++msgstr "" ++"반환 코드 {}로 인하여 저장소 생성에 실패함. 모두 내려받기된 내용은 시스템에" ++"서 보관됩니다" + + #: plugins/modulesync.py:144 + #, python-brace-format + msgid "No match for artifact '{0}' from module '{1}'" +-msgstr "모듈 '{1}'에서 인위 결과물 '{0}'과 일치하는 부분이 없습니다" ++msgstr "모듈 '{1}' 에서 인위 결과물 '{0}'과 일치하는 부분이 없습니다" + + #: plugins/modulesync.py:162 + #, python-brace-format + msgid "No match for package name '{0}' in profile {1} from module {2}" +-msgstr "모듈 {2}에서 프로파일 {1}인 꾸러미 이름 '{0}'과 일치하는 부분이 없습니다" ++msgstr "" ++"모듈 {2}에서 프로파일 {1}인 꾸러미 이름 '{0}'과 일치하는 부분이 없습니다" + + #: plugins/modulesync.py:166 + msgid "No mach for argument '{}'" +-msgstr "인수와 일치하는 항목이 없습니다 '{}'" ++msgstr "인수 '{}'와 일치하는 항목이 없습니다" + + #. TODO(jmracek) Shell we end with an error or with RC 1? + #: plugins/modulesync.py:198 +@@ -881,7 +913,9 @@ msgstr "필요사항 {}를 만족 할 수 없음" + msgid "" + "No installed package found for package name \"{pkg}\" specified in needs-" + "restarting file \"{file}\"." +-msgstr "재시작이 필요한 파일 \"{file}\" 에 지정한 꾸러미 이름 \"{pkg}\"을 위하여 설치된 꾸러미를 찾을 수 없습니다." ++msgstr "" ++"재시작이 필요한 파일 \"{file}\" 에 지정한 꾸러미 이름 \"{pkg}\"을 위하여 설치" ++"된 꾸러미를 찾을 수 없습니다." + + #: plugins/needs_restarting.py:220 + msgid "determine updated binaries that need restarting" +@@ -894,7 +928,8 @@ msgstr "이 사용자의 프로세스만 고려하세요" + #: plugins/needs_restarting.py:227 + msgid "" + "only report whether a reboot is required (exit code 1) or not (exit code 0)" +-msgstr "재시작이 요구되는 (exit code 1) 또는 아닌(exit code0) 경우에만 보고합니다" ++msgstr "" ++"재시작이 요구되는 (exit code 1) 또는 아닌(exit code0) 경우에만 보고합니다" + + #: plugins/needs_restarting.py:230 + msgid "only report affected systemd services" +@@ -947,9 +982,9 @@ msgid "Display a list of unresolved dependencies for repositories" + msgstr "저장소에 대한 확인되지 않은 종속성 목록 표시" + + #: plugins/repoclosure.py:69 +-msgid "" +-"Repoclosure ended with unresolved dependencies ({}) across {} packages." +-msgstr "Repoclosure는 {} 꾸러미를 통해 해결되지 않은 의존성 ({})으로 종료되었습니다." ++msgid "Repoclosure ended with unresolved dependencies ({}) across {} packages." ++msgstr "" ++"Repoclosure는 {} 꾸러미를 통해 해결되지 않은 의존성 ({})으로 종료되었습니다." + + #: plugins/repoclosure.py:159 + msgid "check packages of the given archs, can be specified multiple times" +@@ -983,7 +1018,9 @@ msgstr "여러 번 사용 될 수 있는, 새로운 저장소를 지정합니다 + msgid "" + "Specify architectures to compare, can be used multiple times. By default, " + "only source rpms are compared." +-msgstr "비교 할 구조를 지정하고, 여러 번 사용 될 수 있습니다. 기본적으로, 자원 rpms만 비교됩니다." ++msgstr "" ++"비교 할 구조를 지정하고, 여러 번 사용 될 수 있습니다. 기본적으로, 자원 rpms" ++"만 비교됩니다." + + #: plugins/repodiff.py:67 + msgid "Output additional data about the size of the changes." +@@ -991,9 +1028,10 @@ msgstr "크기 변화에 대한 추가 자료를 출력합니다." + + #: plugins/repodiff.py:69 + msgid "" +-"Compare packages also by arch. By default packages are compared just by " +-"name." +-msgstr "구조에 의해 꾸러미 또한 비교합니다. 기본적으로 꾸러미는 이름으로만 비교됩니다." ++"Compare packages also by arch. By default packages are compared just by name." ++msgstr "" ++"구조에 의해 꾸러미 또한 비교합니다. 기본적으로 꾸러미는 이름으로만 비교됩니" ++"다." + + #: plugins/repodiff.py:72 + msgid "Output a simple one line message for modified packages." +@@ -1124,7 +1162,7 @@ msgstr "--oldonly 또는 --new 중 하나를 전달하세요!" + + #: plugins/repomanage.py:63 + msgid "Pass either --old or --oldonly, not both!" +-msgstr "--oldonly 또는 --new 중 하나를 전달하세요!" ++msgstr "--old 또는 --oldonly 중 하나를 전달하세요!" + + #: plugins/repomanage.py:100 + msgid "No files to process" +@@ -1140,11 +1178,11 @@ msgstr "이전 꾸러미 인쇄" + + #: plugins/repomanage.py:225 + msgid "Print the older packages. Exclude the newest packages." +-msgstr "오래된 꾸러미를 출력합니다. 최신 꾸러미는 제외합니다." ++msgstr "이전 꾸러미를 출력합니다. 최신 꾸러미는 제외합니다." + + #: plugins/repomanage.py:227 + msgid "Print the newest packages" +-msgstr "최신 꾸러미(package) 인쇄" ++msgstr "최신 꾸러미 출력" + + #: plugins/repomanage.py:229 + msgid "Space separated output, not newline" +@@ -1152,7 +1190,7 @@ msgstr "공백으로 구분 된 출력이 아닌 개행 문자" + + #: plugins/repomanage.py:231 + msgid "Newest N packages to keep - defaults to 1" +-msgstr "보관할 최신 N 꾸러미(package) - 기본값은 1입니다" ++msgstr "보관하려는 최신 N 꾸러미 - 기본값은 1입니다" + + #: plugins/repomanage.py:234 + msgid "Path to directory" +@@ -1172,7 +1210,7 @@ msgstr "저장소에 더 이상 존재하지 않는 로컬 꾸러미(package) + + #: plugins/reposync.py:68 + msgid "download all the metadata." +-msgstr "모든 메타데이타 내려받기." ++msgstr "모든 메타자료 내려받기." + + #: plugins/reposync.py:70 + msgid "Remove packages that fail GPG signature checking after downloading" +@@ -1184,9 +1222,11 @@ msgstr "또한 comps.xml 내려받기와 압축 풀기" + + #: plugins/reposync.py:75 + msgid "" +-"where to store downloaded repository metadata. Defaults to the value of " +-"--download-path." +-msgstr "내려받은 저장소 메타데이타를 저장하기 위한 장소. --download-path의 값으로 기본 지정합니다." ++"where to store downloaded repository metadata. Defaults to the value of --" ++"download-path." ++msgstr "" ++"내려받은 저장소 메타자료를 저장하기 위한 장소. --download-path의 값으로 기본 " ++"지정합니다." + + #: plugins/reposync.py:78 + msgid "download only newest packages per-repo" +@@ -1219,7 +1259,7 @@ msgstr "다중 저장소와 함께 --norepath를 사용 할 수 없습니다" + #: plugins/reposync.py:132 + #, python-format + msgid "Failed to get mirror for metadata: %s" +-msgstr "메타데이타에 대한 연결주소 얻기를 실패하였습니다:%s" ++msgstr "메타자료에 대한 연결주소 얻기를 실패하였습니다:%s" + + #: plugins/reposync.py:149 + msgid "Failed to get mirror for the group file." +@@ -1256,6 +1296,181 @@ msgstr "저장소에 대한 comps.xml %s 저장된" + msgid "New leaves:" + msgstr "독립 꾸러미:" + ++#. Translators: This string is only used in unit tests. ++#: plugins/system_upgrade.py:45 ++msgid "the color of the sky" ++msgstr "하늘의 색" ++ ++#: plugins/system_upgrade.py:57 ++msgid "Need a --releasever greater than the current system version." ++msgstr "현재 시스템 버전 보다 큰 --releasever가 필요합니다." ++ ++#. Translators: do not change "reboot" here ++#: plugins/system_upgrade.py:59 ++#, python-brace-format ++msgid "" ++"Download complete! Use 'dnf {command} reboot' to start the upgrade.\n" ++"To remove cached metadata and transaction use 'dnf {command} clean'" ++msgstr "" ++"내려받기 완료! 향상을 시작하려면 'dnf {command} reboot'를 사용하세요.\n" ++"캐쉬된 메타자료와 연결을 제거하려면 'dnf {command} clean'을 사용하세요" ++ ++#: plugins/system_upgrade.py:62 ++msgid "Sorry, you need to use 'download --releasever' instead of '--network'" ++msgstr "죄송합니다, '--network' 대신에 'download --releasever'를 사용해야 합니다" ++ ++#: plugins/system_upgrade.py:71 ++msgid "Reboot turned off, not rebooting." ++msgstr "다시 기동하지 않고, 재시작이 꺼졌습니다." ++ ++#: plugins/system_upgrade.py:122 ++#, python-format ++msgid "Screen blanking can't be disabled: %s" ++msgstr "화면 비우기를 비활성화 할 수 없습니다: %s" ++ ++#: plugins/system_upgrade.py:142 ++#, python-format ++msgid "Failed loading state file: %s, continuing with empty state." ++msgstr "상태 파일: %s를 적재 중 실패함, 공백 상태로 유지됨." ++ ++#: plugins/system_upgrade.py:289 ++msgid "The following boots appear to contain upgrade logs:" ++msgstr "다음 기동은 향상된 기록을 포함하여 나타납니다:" ++ ++#: plugins/system_upgrade.py:299 ++msgid "-- no logs were found --" ++msgstr "-- 어떤 기록도 찾을 수 없음 --" ++ ++#: plugins/system_upgrade.py:314 ++msgid "Cannot find logs with this index." ++msgstr "이 표시가 있는 기록을 찾을 수 없습니다." ++ ++#: plugins/system_upgrade.py:323 ++msgid "Unable to match systemd journal entry" ++msgstr "systemd journal 항목과 일치 할 수 없음" ++ ++#: plugins/system_upgrade.py:344 ++msgid "Prepare system for upgrade to a new release" ++msgstr "새로운 출시로 향상하기 위해 시스템을 준비합니다" ++ ++#: plugins/system_upgrade.py:360 ++msgid "keep installed packages if the new release's version is older" ++msgstr "만약 신규 출시의 버전이 오래되었으면 설치된 꾸러미를 유지합니다" ++ ++#: plugins/system_upgrade.py:364 ++msgid "which logs to show" ++msgstr "표시 할 어떤 기록" ++ ++#: plugins/system_upgrade.py:398 ++#, python-brace-format ++msgid "Incompatible version of data. Rerun 'dnf {command} download [OPTIONS]'" ++msgstr "호환되지 않는 자료 버전. 'dnf {command} download [OPTIONS]' 되돌리기" ++ ++#: plugins/system_upgrade.py:434 ++msgid "Command 'offline-distrosync' cannot be used with --no-downgrade option" ++msgstr "명령 'offline-distrosync'은 --no-downgrade 옵션과 함께 사용 될 수 없습니다" ++ ++#: plugins/system_upgrade.py:454 ++msgid "" ++"WARNING: this operation is not supported on the RHEL distribution. Proceed " ++"at your own risk." ++msgstr "경고: 이와 같은 동작은 RHEL 배포판에서 지원되지 않습니다. 자신의 책임 하에 " ++"진행하세요." ++ ++#: plugins/system_upgrade.py:458 ++msgid "Additional information for System Upgrade: {}" ++msgstr "시스템 향상을 위한 추가 정보: {}" ++ ++#: plugins/system_upgrade.py:461 ++msgid "" ++"Before you continue ensure that your system is fully upgraded by running " ++"\"dnf --refresh upgrade\". Do you want to continue" ++msgstr "계속하기 전에 dnf --refresh upgrade\" 실행하여 시스템을 완전히 향상 되도록 " ++"해주세요. 계속 하길 원하세요" ++ ++#: plugins/system_upgrade.py:465 ++msgid "Operation aborted." ++msgstr "작업이 중지됩니다." ++ ++#: plugins/system_upgrade.py:526 ++msgid "system is not ready for upgrade" ++msgstr "시스템이 향상을 위해 준비되지 않았습니다" ++ ++#: plugins/system_upgrade.py:529 ++#, python-brace-format ++msgid "" ++"the transaction was not prepared for '{command}'. Rerun 'dnf {command} " ++"download [OPTIONS]'" ++msgstr "" ++"연결이 '{command}'을 위해 준비되지 않았습니다. 'dnf {command} download " ++"[OPTIONS]'을 되돌립니다" ++ ++#: plugins/system_upgrade.py:533 ++msgid "upgrade is already scheduled" ++msgstr "향상은 이미 계획되어 있습니다" ++ ++#: plugins/system_upgrade.py:539 ++msgid "trigger file does not exist. exiting quietly." ++msgstr "트리거 파일이 존재하지 않습니다. 바로 종료하기." ++ ++#: plugins/system_upgrade.py:542 ++msgid "another upgrade tool is running. exiting quietly." ++msgstr "다른 향상 도구가 동작 중입니다. 바로 종료하기." ++ ++#: plugins/system_upgrade.py:551 ++#, python-brace-format ++msgid "use 'dnf {command} reboot' to begin the upgrade" ++msgstr "'dnf {command} reboot' 사용하여 향상을 시작합니다" ++ ++#: plugins/system_upgrade.py:569 ++msgid "Rebooting to perform upgrade." ++msgstr "향상을 수행하기 위해서 재시작 중." ++ ++#: plugins/system_upgrade.py:602 ++msgid "Starting offline upgrade. This will take a while." ++msgstr "오프라인 향상 시작하기. 이는 시간이 좀 걸립니다." ++ ++#: plugins/system_upgrade.py:604 ++msgid "Starting offline distrosync. This will take a while." ++msgstr "오프라인 distrosync 시작 중. 이는 시간이 좀 걸립니다." ++ ++#: plugins/system_upgrade.py:606 ++msgid "Starting system upgrade. This will take a while." ++msgstr "시스템 향상이 시작 중. 이는 시간이 좀 걸립니다." ++ ++#: plugins/system_upgrade.py:622 ++msgid "Cleaning up downloaded data..." ++msgstr "내려받기된 자료를 정리 중..." ++ ++#: plugins/system_upgrade.py:652 ++msgid "" ++"The system-upgrade transaction is empty, your system is already up-to-date." ++msgstr "시스템-향상 연결이 비워 있으며, 시스템은 이미 최신화 되었습니다." ++ ++#: plugins/system_upgrade.py:661 ++msgid "Transaction saved to {}." ++msgstr "연결이 {}로 저장되었습니다." ++ ++#: plugins/system_upgrade.py:664 ++msgid "Error storing transaction: {}" ++msgstr "저장 중 연결 오류: {}" ++ ++#: plugins/system_upgrade.py:686 ++msgid "Download finished." ++msgstr "내려받기 완료됨." ++ ++#: plugins/system_upgrade.py:689 plugins/system_upgrade.py:690 ++msgid "Upgrade complete! Cleaning up and rebooting..." ++msgstr "향상 성공! 정리하고 재시작하기..." ++ ++#: plugins/system_upgrade.py:699 ++msgid "Prepare offline upgrade of the system" ++msgstr "시스템의 오프라인 향상을 준비합니다" ++ ++#: plugins/system_upgrade.py:704 ++msgid "Prepare offline distrosync of the system" ++msgstr "시스템의 오프라인 distrosync를 준비합니다" ++ + #: plugins/versionlock.py:33 + #, python-format + msgid "Unable to read version lock configuration: %s" +@@ -1302,7 +1517,8 @@ msgid "Versionlock plugin: number of lock rules from file \"{}\" applied: {}" + msgstr "버전 잠금 플러그인: 적용된 파일 \"{} \"에서 잠금 규칙의 수: {}" + + #: plugins/versionlock.py:44 +-msgid "Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" ++msgid "" ++"Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" + msgstr "버전 잠금 플러그인: 적용된 파일 \"{} \"에서 제외 규칙의 수: {}" + + #: plugins/versionlock.py:45 +@@ -1319,7 +1535,9 @@ msgstr "꾸러미(package) 사양을 그대로 사용하며, 구문 분석을 + + #: plugins/versionlock.py:164 + msgid "Subcommand '{}' is deprecated. Use 'exclude' subcommand instead." +-msgstr "하위명령 '{}'는 더 이상 사용하지 않습니다. 대신에 하위명령 'exclude'를 사용합니다." ++msgstr "" ++"하위명령 '{}'는 더 이상 사용하지 않습니다. 대신에 하위명령 'exclude'를 사용합" ++"니다." + + #~ msgid "" + #~ "This repository does not have any builds yet so you cannot enable it now." +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 88d02a1..9fdd07c 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -5,22 +5,24 @@ + # cheng ye <18969068329@163.com>, 2017. #zanata + # Ludek Janda , 2018. #zanata, 2021. + # Hongqiao Chen , 2020. ++# Sundeep Anand , 2021. + # Qiyu Yan , 2021. +-# Transtats , 2022. ++# Transtats , 2022, 2023. + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-08-08 02:57+0000\n" +-"PO-Revision-Date: 2022-03-09 10:22+0000\n" ++"POT-Creation-Date: 2023-02-28 12:26+0100\n" ++"PO-Revision-Date: 2023-03-06 13:48+0000\n" + "Last-Translator: Transtats \n" +-"Language-Team: Chinese (Simplified) \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: Weblate 4.11.2\n" ++"X-Generator: Weblate 4.15.2\n" + + #: plugins/builddep.py:45 + msgid "[PACKAGE|PACKAGE.spec]" +@@ -60,8 +62,7 @@ msgid "Some packages could not be found." + msgstr "某些软件包无法找到。" + + #. No provides, no files +-#. Richdeps can have no matches but it could be correct (solver must decide +-#. later) ++#. Richdeps can have no matches but it could be correct (solver must decide later) + #: plugins/builddep.py:173 + #, python-format + msgid "No matching package to install: '%s'" +@@ -72,16 +73,21 @@ msgstr "没有匹配的软件包可以安装： '%s'" + msgid "Failed to open: '%s', not a valid source rpm file." + msgstr "打开文件失败： '%s'，不是有效的源码 RPM 文件。" + +-#: plugins/builddep.py:204 plugins/builddep.py:220 plugins/builddep.py:237 ++#: plugins/builddep.py:204 plugins/builddep.py:224 plugins/builddep.py:241 + msgid "Not all dependencies satisfied" + msgstr "没有满足全部的依赖关系" + +-#: plugins/builddep.py:211 ++#: plugins/builddep.py:208 ++msgid "" ++"Warning: -D or --define arguments have no meaning for source rpm packages." ++msgstr "警告：-D 或 --define 参数对源 rpm 软件包没有意义。" ++ ++#: plugins/builddep.py:215 + #, python-format + msgid "Failed to open: '%s', not a valid spec file: %s" + msgstr "打开失败： '%s'， 不是有效的 spec 文件： %s" + +-#: plugins/builddep.py:230 plugins/repoclosure.py:124 ++#: plugins/builddep.py:234 plugins/repoclosure.py:124 + #, python-format + msgid "no package matched: %s" + msgstr "无匹配软件包： %s" +@@ -99,7 +105,8 @@ msgstr "查看软件包的改变日志数据" + msgid "" + "show changelog entries since DATE. To avoid ambiguosity, YYYY-MM-DD format " + "is recommended." +-msgstr "显示自 DATE 开始的改变日志信息。为了避免混淆，推荐使用 YYYY-MM-DD 格式。" ++msgstr "" ++"显示自 DATE 开始的改变日志信息。为了避免混淆，推荐使用 YYYY-MM-DD 格式。" + + #: plugins/changelog.py:55 + msgid "show given number of changelog entries per package" +@@ -183,8 +190,8 @@ msgid "" + "Warning: --enablerepo/--disablerepo arguments have no meaningwith config " + "manager. Use --set-enabled/--set-disabled instead." + msgstr "" +-"警告：--enablerepo/--disablerepo 参数对于 config manager 没有作用。请使用 --set-" +-"enabled/--set-disabled。" ++"警告：--enablerepo/--disablerepo 参数对于 config manager 没有作用。请使用 --" ++"set-enabled/--set-disabled。" + + #: plugins/config_manager.py:132 + #, python-format +@@ -290,10 +297,11 @@ msgstr "错误： " + + #: plugins/copr.py:165 + msgid "" +-"specify Copr hub either with `--hub` or using " +-"`copr_hub/copr_username/copr_projectname` format" ++"specify Copr hub either with `--hub` or using `copr_hub/copr_username/" ++"copr_projectname` format" + msgstr "" +-"使用 `--hub` 或使用 `copr_hub/copr_username/copr_projectname` 格式指定 Copr hub" ++"使用 `--hub` 或使用 `copr_hub/copr_username/copr_projectname` 格式指定 Copr " ++"hub" + + #: plugins/copr.py:168 + msgid "multiple hubs specified" +@@ -329,7 +337,8 @@ msgid "" + "\n" + "The Fedora Project does not exercise any power over the contents of\n" + "this repository beyond the rules outlined in the Copr FAQ at\n" +-",\n" ++",\n" + "and packages are not held to any quality or security level.\n" + "\n" + "Please do not file bug reports about these packages in Fedora\n" +@@ -340,7 +349,8 @@ msgstr "" + "不是主发行版本的一部分，质量可能会有所不同。\n" + "\n" + "Fedora 项目对其不行使除了于 Copr 常见问题\n" +-"\n" ++"\n" + "中所提出的规则外的任何权力，并且其软件包不保证达到特定质量\n" + "和安全水准。\n" + "\n" +@@ -365,11 +375,12 @@ msgstr "未知的子命令 {}。" + + #: plugins/copr.py:367 + msgid "" +-"* These coprs have repo file with an old format that contains no information" +-" about Copr hub - the default one was assumed. Re-enable the project to fix " ++"* These coprs have repo file with an old format that contains no information " ++"about Copr hub - the default one was assumed. Re-enable the project to fix " + "this." + msgstr "" +-"* 这些 coprs 有使用旧格式的 repo 文件，它们没有包括 Copr hub 的信息 - 假设使用默认值。重新启用项目来解决这个问题。" ++"* 这些 coprs 有使用旧格式的 repo 文件，它们没有包括 Copr hub 的信息 - 假设使" ++"用默认值。重新启用项目来解决这个问题。" + + #: plugins/copr.py:380 + msgid "Can't parse repositories for username '{}'." +@@ -406,27 +417,24 @@ msgstr "该命令必须以 root 用户运行。" + #: plugins/copr.py:487 + #, python-brace-format + msgid "Request to {0} failed: {1} - {2}" +-msgstr "" ++msgstr "请求 {0} 失败：{1} - {2}" + + #: plugins/copr.py:489 + msgid "It wasn't possible to enable this project.\n" +-msgstr "" ++msgstr "无法启用此项目。\n" + + #: plugins/copr.py:494 +-#, fuzzy, python-brace-format +-#| msgid "Such repository does not exist." ++#, python-brace-format + msgid "Repository '{0}' does not exist in project '{1}'." +-msgstr "该软件仓库不存在。" ++msgstr "仓库 '{0}' 在项目 '{1}' 中不存在。" + + #: plugins/copr.py:497 +-#, fuzzy +-#| msgid "List enabled Copr repositories" + msgid "" + "\n" + "Available repositories: " + msgstr "" + "\n" +-"列出启动的 Copr 仓库 " ++"可用软件仓库： " + + #: plugins/copr.py:499 + #, python-brace-format +@@ -437,18 +445,21 @@ msgid "" + " 'dnf copr enable {0} '\n" + "But note that the installed repo file will likely need a manual modification." + msgstr "" ++"\n" ++"\n" ++"如果需要启用一个非默认的仓库，使用以下命令 :\n" ++" 'dnf copr enable {0} '\n" ++"但请注意，安装的 repo 文件将来可能需要手动修改。" + + #: plugins/copr.py:505 +-#, fuzzy, python-brace-format +-#| msgid "Such repository does not exist." ++#, python-brace-format + msgid "Project {0} does not exist." +-msgstr "该软件仓库不存在。" ++msgstr "项目 {0} 不存在。" + + #: plugins/copr.py:508 +-#, fuzzy, python-brace-format +-#| msgid "Failed to remove copr repo {0}/{1}/{2}" ++#, python-brace-format + msgid "Failed to connect to {0}: {1}" +-msgstr "删除 copr 仓库 {0}/{1}/{2} 失败" ++msgstr "连接到 {0} 失败：{1}" + + #: plugins/copr.py:555 + #, python-brace-format +@@ -486,11 +497,11 @@ msgstr "您需要保持它们被启用吗？" + #: plugins/copr.py:609 + #, python-brace-format + msgid "Failed to remove copr repo {0}/{1}/{2}" +-msgstr "删除 copr 仓库 {0}/{1}/{2} 失败" ++msgstr "无法删除 copr 存储库 {0}/{1}/{2}" + + #: plugins/copr.py:620 + msgid "Failed to disable copr repo {}/{}" +-msgstr "无法禁用 Copr 软件仓库 {}/{}" ++msgstr "无法禁用 Copr 存储库 {}/{}" + + #: plugins/copr.py:638 plugins/copr.py:675 + msgid "Unknown response from server." +@@ -563,7 +574,9 @@ msgstr "限制到指定类型" + msgid "" + "Allow removing of install-only packages. Using this option may result in an " + "attempt to remove the running kernel." +-msgstr "允许删除仅安装(install-only)的软件包。使用这个选项可能会导致尝试删除正在运行的内核。" ++msgstr "" ++"允许删除仅安装(install-only)的软件包。使用这个选项可能会导致尝试删除正在运行" ++"的内核。" + + #: plugins/debug.py:202 + msgid "name of dump file" +@@ -767,7 +780,7 @@ msgstr "软件包规格" + + #: plugins/groups_manager.py:156 + msgid "Can't edit group without specifying it (use --id or --name)" +-msgstr "没有指定组（使用 --id 或 --name）就无法编辑组" ++msgstr "没有指定它（使用 --id 或 --name）就不能编辑组" + + #: plugins/groups_manager.py:190 + msgid "Can't load file \"{}\": {}" +@@ -787,8 +800,8 @@ msgstr "无法从不存在的组中删除软件包" + + #: plugins/groups_manager.py:307 + msgid "" +-"Group id '{}' generated from '{}' is duplicit. Please specify group id using" +-" --id." ++"Group id '{}' generated from '{}' is duplicit. Please specify group id using " ++"--id." + msgstr "从 '{}' 生成的组 id '{}' 是显式的。请使用 --id 指定组 ID。" + + #: plugins/leaves.py:32 +@@ -821,7 +834,7 @@ msgstr "迁移 yum 的历史、分组以及 yumdb 数据至 dnf" + + #: plugins/migrate.py:54 + msgid "Migrating history data..." +-msgstr "正在迁移历史数据…" ++msgstr "正在迁移历史数据..." + + #: plugins/modulesync.py:37 + msgid "" +@@ -851,7 +864,7 @@ msgstr "只从最新的模块中下载软件包" + #: plugins/modulesync.py:85 + msgid "Unable to find a match for argument: '{}'" + msgid_plural "Unable to find a match for arguments: '{}'" +-msgstr[0] "找不到与参数：'{}'相匹配的项" ++msgstr[0] "找不到与参数匹配的项：'{}'" + + #: plugins/modulesync.py:107 + msgid "" +@@ -862,12 +875,12 @@ msgstr "创建存储库会失败，并显示返回码 {}。所有下载的内容 + #: plugins/modulesync.py:144 + #, python-brace-format + msgid "No match for artifact '{0}' from module '{1}'" +-msgstr "没有与模块 '{1}' 的工件 '{0}' 相匹配的项" ++msgstr "没有与来自模块 '{1}' 的工件 '{0}' 相匹配的项" + + #: plugins/modulesync.py:162 + #, python-brace-format + msgid "No match for package name '{0}' in profile {1} from module {2}" +-msgstr "没有与模块 {2} 中配置文件 {1} 的软件包名称 '{0}' 相匹配的项" ++msgstr "没有与来自模块 {2} 中配置集 {1} 的软件包名称 '{0}' 相匹配的项" + + #: plugins/modulesync.py:166 + msgid "No mach for argument '{}'" +@@ -883,7 +896,9 @@ msgstr "无法满足要求 {}" + msgid "" + "No installed package found for package name \"{pkg}\" specified in needs-" + "restarting file \"{file}\"." +-msgstr "未找到在需要重新启动文件 \"{file}\" 中指定的软件包名为 \"{pkg}\" 的已安装的软件包。" ++msgstr "" ++"未找到在需要重新启动的文件 \"{file}\" 中指定的软件包名为 \"{pkg}\" 的已安装的" ++"软件包。" + + #: plugins/needs_restarting.py:220 + msgid "determine updated binaries that need restarting" +@@ -949,11 +964,8 @@ msgid "Display a list of unresolved dependencies for repositories" + msgstr "显示仓库中未被解决的依赖关系的列表" + + #: plugins/repoclosure.py:69 +-#, fuzzy +-#| msgid "Repoclosure ended with unresolved dependencies." +-msgid "" +-"Repoclosure ended with unresolved dependencies ({}) across {} packages." +-msgstr "Repoclosure 退出时还有依赖关系未解决。" ++msgid "Repoclosure ended with unresolved dependencies ({}) across {} packages." ++msgstr "Repoclosure 退出时还有未解决的依赖项（{}），针对 {} 软件包。" + + #: plugins/repoclosure.py:159 + msgid "check packages of the given archs, can be specified multiple times" +@@ -995,8 +1007,7 @@ msgstr "输出关于改变大小的额外数据。" + + #: plugins/repodiff.py:69 + msgid "" +-"Compare packages also by arch. By default packages are compared just by " +-"name." ++"Compare packages also by arch. By default packages are compared just by name." + msgstr "同时按架构比较软件包。在默认情况下只按名称比较软件包。" + + #: plugins/repodiff.py:72 +@@ -1120,19 +1131,15 @@ msgstr "管理 RPM 软件包目录" + + #: plugins/repomanage.py:59 + msgid "Pass either --old or --new, not both!" +-msgstr "传入 --old 或者 --new，不可同时传入！" ++msgstr "传递 --old 或者 --new，而不是两者都传递！" + + #: plugins/repomanage.py:61 +-#, fuzzy +-#| msgid "Pass either --old or --new, not both!" + msgid "Pass either --oldonly or --new, not both!" +-msgstr "传入 --old 或者 --new，不可同时传入！" ++msgstr "传递 --oldonly 或 --new，而不是两者都传递！" + + #: plugins/repomanage.py:63 +-#, fuzzy +-#| msgid "Pass either --old or --new, not both!" + msgid "Pass either --old or --oldonly, not both!" +-msgstr "传入 --old 或者 --new，不可同时传入！" ++msgstr "传递 --old 或 --oldonly，而不是两者都传递！" + + #: plugins/repomanage.py:100 + msgid "No files to process" +@@ -1147,10 +1154,8 @@ msgid "Print the older packages" + msgstr "打印较旧的软件包" + + #: plugins/repomanage.py:225 +-#, fuzzy +-#| msgid "Print the newest packages" + msgid "Print the older packages. Exclude the newest packages." +-msgstr "打印最新的软件包" ++msgstr "打印旧的软件包。排除最新的软件包。" + + #: plugins/repomanage.py:227 + msgid "Print the newest packages" +@@ -1194,8 +1199,8 @@ msgstr "同时下载并解压 comps.xml" + + #: plugins/reposync.py:75 + msgid "" +-"where to store downloaded repository metadata. Defaults to the value of " +-"--download-path." ++"where to store downloaded repository metadata. Defaults to the value of --" ++"download-path." + msgstr "存储下载的仓库元数据的位置。默认为 --download-path 的值。" + + #: plugins/reposync.py:78 +@@ -1266,6 +1271,178 @@ msgstr "仓库 %s 的 comps.xml 已保存" + msgid "New leaves:" + msgstr "新增保留项：" + ++#. Translators: This string is only used in unit tests. ++#: plugins/system_upgrade.py:45 ++msgid "the color of the sky" ++msgstr "sky 的颜色" ++ ++#: plugins/system_upgrade.py:57 ++msgid "Need a --releasever greater than the current system version." ++msgstr "需要大于当前系统版本的 --releasever。" ++ ++#. Translators: do not change "reboot" here ++#: plugins/system_upgrade.py:59 ++#, python-brace-format ++msgid "" ++"Download complete! Use 'dnf {command} reboot' to start the upgrade.\n" ++"To remove cached metadata and transaction use 'dnf {command} clean'" ++msgstr "" ++"下载完成！使用 'dnf {command} reboot' 启动升级。 \n" ++" 要删除缓存的元数据和事务，请使用 'dnf {command} clean'" ++ ++#: plugins/system_upgrade.py:62 ++msgid "Sorry, you need to use 'download --releasever' instead of '--network'" ++msgstr "您需要使用 'download --releasever' 而不是 '-network'" ++ ++#: plugins/system_upgrade.py:71 ++msgid "Reboot turned off, not rebooting." ++msgstr "重启被关闭，没有重新启动。" ++ ++#: plugins/system_upgrade.py:122 ++#, python-format ++msgid "Screen blanking can't be disabled: %s" ++msgstr "无法禁用屏幕空白：%s" ++ ++#: plugins/system_upgrade.py:142 ++#, python-format ++msgid "Failed loading state file: %s, continuing with empty state." ++msgstr "加载状态文件失败：%s，继续为空状态。" ++ ++#: plugins/system_upgrade.py:289 ++msgid "The following boots appear to contain upgrade logs:" ++msgstr "以下引导会包含升级日志：" ++ ++#: plugins/system_upgrade.py:299 ++msgid "-- no logs were found --" ++msgstr "-- 没有找到日志 --" ++ ++#: plugins/system_upgrade.py:314 ++msgid "Cannot find logs with this index." ++msgstr "无法找到使用此索引的日志。" ++ ++#: plugins/system_upgrade.py:323 ++msgid "Unable to match systemd journal entry" ++msgstr "无法与 systemd 日志条目匹配" ++ ++#: plugins/system_upgrade.py:344 ++msgid "Prepare system for upgrade to a new release" ++msgstr "准备系统以升级到新版本" ++ ++#: plugins/system_upgrade.py:360 ++msgid "keep installed packages if the new release's version is older" ++msgstr "如果新版本中的版本更旧，保留安装的软件包" ++ ++#: plugins/system_upgrade.py:364 ++msgid "which logs to show" ++msgstr "要显示的日志" ++ ++#: plugins/system_upgrade.py:398 ++#, python-brace-format ++msgid "Incompatible version of data. Rerun 'dnf {command} download [OPTIONS]'" ++msgstr "不兼容的数据版本。重新运行 'dnf {command} download [OPTIONS]'" ++ ++#: plugins/system_upgrade.py:434 ++msgid "Command 'offline-distrosync' cannot be used with --no-downgrade option" ++msgstr "命令 'offline-distrosync' 无法与 --no-downgrade 选项一起使用" ++ ++#: plugins/system_upgrade.py:454 ++msgid "" ++"WARNING: this operation is not supported on the RHEL distribution. Proceed " ++"at your own risk." ++msgstr "警告：在 RHEL 发行版上不支持此操作。您需要自性承担相关的风险。" ++ ++#: plugins/system_upgrade.py:458 ++msgid "Additional information for System Upgrade: {}" ++msgstr "系统升级的额外信息：{}" ++ ++#: plugins/system_upgrade.py:461 ++msgid "" ++"Before you continue ensure that your system is fully upgraded by running " ++"\"dnf --refresh upgrade\". Do you want to continue" ++msgstr "在继续请，确定您的系统已通过运行 \"dnf --refresh upgrade\" " ++"完全升级。您要继续操作" ++ ++#: plugins/system_upgrade.py:465 ++msgid "Operation aborted." ++msgstr "操作中止。" ++ ++#: plugins/system_upgrade.py:526 ++msgid "system is not ready for upgrade" ++msgstr "系统还未就绪进行升级" ++ ++#: plugins/system_upgrade.py:529 ++#, python-brace-format ++msgid "" ++"the transaction was not prepared for '{command}'. Rerun 'dnf {command} " ++"download [OPTIONS]'" ++msgstr "事务没有为 '{command}' 准备。重新运行 'dnf {command} download [OPTIONS]'" ++ ++#: plugins/system_upgrade.py:533 ++msgid "upgrade is already scheduled" ++msgstr "升级已被调度" ++ ++#: plugins/system_upgrade.py:539 ++msgid "trigger file does not exist. exiting quietly." ++msgstr "触发器文件不存在。静默退出。" ++ ++#: plugins/system_upgrade.py:542 ++msgid "another upgrade tool is running. exiting quietly." ++msgstr "另一个升级工具正在运行。静默退出。" ++ ++#: plugins/system_upgrade.py:551 ++#, python-brace-format ++msgid "use 'dnf {command} reboot' to begin the upgrade" ++msgstr "使用 'dnf {command} reboot' 开始升级" ++ ++#: plugins/system_upgrade.py:569 ++msgid "Rebooting to perform upgrade." ++msgstr "重启以执行升级。" ++ ++#: plugins/system_upgrade.py:602 ++msgid "Starting offline upgrade. This will take a while." ++msgstr "启动离线升级。这将需要一段时间。" ++ ++#: plugins/system_upgrade.py:604 ++msgid "Starting offline distrosync. This will take a while." ++msgstr "启动离线 distrosync。这将需要一段时间。" ++ ++#: plugins/system_upgrade.py:606 ++msgid "Starting system upgrade. This will take a while." ++msgstr "启动系统升级。这需要一段时间。" ++ ++#: plugins/system_upgrade.py:622 ++msgid "Cleaning up downloaded data..." ++msgstr "清理下载的数据..." ++ ++#: plugins/system_upgrade.py:652 ++msgid "" ++"The system-upgrade transaction is empty, your system is already up-to-date." ++msgstr "system-upgrade 事务为空，您的系统已经为最新版本。" ++ ++#: plugins/system_upgrade.py:661 ++msgid "Transaction saved to {}." ++msgstr "事务已保存到 {}。" ++ ++#: plugins/system_upgrade.py:664 ++msgid "Error storing transaction: {}" ++msgstr "存储事务时出现错误：{}" ++ ++#: plugins/system_upgrade.py:686 ++msgid "Download finished." ++msgstr "下载已完成。" ++ ++#: plugins/system_upgrade.py:689 plugins/system_upgrade.py:690 ++msgid "Upgrade complete! Cleaning up and rebooting..." ++msgstr "升级完成！清理并重启..." ++ ++#: plugins/system_upgrade.py:699 ++msgid "Prepare offline upgrade of the system" ++msgstr "准备系统的离线升级" ++ ++#: plugins/system_upgrade.py:704 ++msgid "Prepare offline distrosync of the system" ++msgstr "准备系统的离线 distrosync" ++ + #: plugins/versionlock.py:33 + #, python-format + msgid "Unable to read version lock configuration: %s" +@@ -1312,7 +1489,8 @@ msgid "Versionlock plugin: number of lock rules from file \"{}\" applied: {}" + msgstr "Versionlock 插件: 文件 \"{}\" 中的锁定数量规则被应用：{}" + + #: plugins/versionlock.py:44 +-msgid "Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" ++msgid "" ++"Versionlock plugin: number of exclude rules from file \"{}\" applied: {}" + msgstr "Versionlock 插件: 文件 \"{}\" 中的排除规则数量被应用：{}" + + #: plugins/versionlock.py:45 +-- +2.39.2 + diff --git a/SPECS/dnf-plugins-core.spec b/SPECS/dnf-plugins-core.spec index 0cf02b2..c1155de 100644 --- a/SPECS/dnf-plugins-core.spec +++ b/SPECS/dnf-plugins-core.spec @@ -33,14 +33,18 @@ %endif Name: dnf-plugins-core -Version: 4.1.0 -Release: 3%{?dist} +Version: 4.3.0 +Release: 5%{?dist} Summary: Core Plugins for DNF License: GPLv2+ URL: https://github.com/rpm-software-management/dnf-plugins-core Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch1: 0001-copr-Guess-EPEL-chroots-for-CentOS-Stream-RhBug-2058.patch -Patch2: 0002-Update-translations.patch +Patch1: 0001-Move-system-upgrade-plugin-to-core-RhBug-2054235.patch +Patch2: 0002-Add-a-warning-when-using-system-upgrade-on-RHEL.patch +Patch3: 0003-offline-upgrade-Add-security-filters.patch +Patch4: 0004-system-upgrade-Show-warning-always-for-a-downstream.patch +Patch5: 0005-Update-translations.patch + BuildArch: noarch BuildRequires: cmake @@ -67,6 +71,9 @@ Provides: dnf-command(repograph) Provides: dnf-command(repomanage) Provides: dnf-command(reposync) Provides: dnf-command(repodiff) +Provides: dnf-command(system-upgrade) +Provides: dnf-command(offline-upgrade) +Provides: dnf-command(offline-distrosync) Provides: dnf-plugins-extras-debug = %{version}-%{release} Provides: dnf-plugins-extras-repoclosure = %{version}-%{release} Provides: dnf-plugins-extras-repograph = %{version}-%{release} @@ -83,6 +90,7 @@ Provides: dnf-plugin-repodiff = %{version}-%{release} Provides: dnf-plugin-repograph = %{version}-%{release} Provides: dnf-plugin-repomanage = %{version}-%{release} Provides: dnf-plugin-reposync = %{version}-%{release} +Provides: dnf-plugin-system-upgrade = %{version}-%{release} %if %{with yumcompatibility} Provides: yum-plugin-copr = %{version}-%{release} Provides: yum-plugin-changelog = %{version}-%{release} @@ -136,8 +144,8 @@ Conflicts: python-%{name} < %{version}-%{release} %description -n python2-%{name} Core Plugins for DNF, Python 2 interface. This package enhances DNF with builddep, config-manager, copr, degug, debuginfo-install, download, needs-restarting, -groups-manager, repoclosure, repograph, repomanage, reposync, changelog -and repodiff commands. +groups-manager, repoclosure, repograph, repomanage, reposync, changelog, +repodiff, system-upgrade, offline-upgrade and offline-distrosync commands. Additionally provides generate_completion_cache passive plugin. %endif @@ -148,6 +156,10 @@ Summary: Core Plugins for DNF BuildRequires: python3-dbus BuildRequires: python3-devel BuildRequires: python3-dnf >= %{dnf_lowest_compatible} +BuildRequires: python3-systemd +BuildRequires: pkgconfig(systemd) +BuildRequires: systemd +%{?systemd_ordering} %if 0%{?fedora} Requires: python3-distro %endif @@ -155,14 +167,17 @@ Requires: python3-dbus Requires: python3-dnf >= %{dnf_lowest_compatible} Requires: python3-hawkey >= %{hawkey_version} Requires: python3-dateutil +Requires: python3-systemd Provides: python3-dnf-plugins-extras-debug = %{version}-%{release} Provides: python3-dnf-plugins-extras-repoclosure = %{version}-%{release} Provides: python3-dnf-plugins-extras-repograph = %{version}-%{release} Provides: python3-dnf-plugins-extras-repomanage = %{version}-%{release} +Provides: python3-dnf-plugin-system-upgrade = %{version}-%{release} Obsoletes: python3-dnf-plugins-extras-debug < %{dnf_plugins_extra} Obsoletes: python3-dnf-plugins-extras-repoclosure < %{dnf_plugins_extra} Obsoletes: python3-dnf-plugins-extras-repograph < %{dnf_plugins_extra} Obsoletes: python3-dnf-plugins-extras-repomanage < %{dnf_plugins_extra} +Obsoletes: python3-dnf-plugin-system-upgrade < %{version}-%{release} Conflicts: %{name} <= 0.1.5 # let the both python plugin versions be updated simultaneously @@ -172,8 +187,8 @@ Conflicts: python-%{name} < %{version}-%{release} %description -n python3-%{name} Core Plugins for DNF, Python 3 interface. This package enhances DNF with builddep, config-manager, copr, debug, debuginfo-install, download, needs-restarting, -groups-manager, repoclosure, repograph, repomanage, reposync, changelog -and repodiff commands. +groups-manager, repoclosure, repograph, repomanage, reposync, changelog, +repodiff, system-upgrade, offline-upgrade and offline-distrosync commands. Additionally provides generate_completion_cache passive plugin. %endif @@ -454,6 +469,17 @@ pushd build-py3 %make_install popd %endif + +%if %{with python3} +mkdir -p %{buildroot}%{_unitdir}/system-update.target.wants/ +pushd %{buildroot}%{_unitdir}/system-update.target.wants/ + ln -sr ../dnf-system-upgrade.service +popd + +ln -sf %{_mandir}/man8/dnf-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf-offline-upgrade.8.gz +ln -sf %{_mandir}/man8/dnf-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf-offline-distrosync.8.gz +%endif + %find_lang %{name} %if %{with yumutils} %if %{with python3} @@ -518,6 +544,9 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/ %{_mandir}/man8/dnf-repograph.* %{_mandir}/man8/dnf-repomanage.* %{_mandir}/man8/dnf-reposync.* +%{_mandir}/man8/dnf-system-upgrade.* +%{_mandir}/man8/dnf-offline-upgrade.* +%{_mandir}/man8/dnf-offline-distrosync.* %if %{with yumcompatibility} %{_mandir}/man1/yum-changelog.* %{_mandir}/man8/yum-copr.* @@ -575,6 +604,7 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/ %{python3_sitelib}/dnf-plugins/repograph.py %{python3_sitelib}/dnf-plugins/repomanage.py %{python3_sitelib}/dnf-plugins/reposync.py +%{python3_sitelib}/dnf-plugins/system_upgrade.py %{python3_sitelib}/dnf-plugins/__pycache__/builddep.* %{python3_sitelib}/dnf-plugins/__pycache__/changelog.* %{python3_sitelib}/dnf-plugins/__pycache__/config_manager.* @@ -590,7 +620,11 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/ %{python3_sitelib}/dnf-plugins/__pycache__/repograph.* %{python3_sitelib}/dnf-plugins/__pycache__/repomanage.* %{python3_sitelib}/dnf-plugins/__pycache__/reposync.* +%{python3_sitelib}/dnf-plugins/__pycache__/system_upgrade.* %{python3_sitelib}/dnfpluginscore/ +%{_unitdir}/dnf-system-upgrade.service +%{_unitdir}/dnf-system-upgrade-cleanup.service +%{_unitdir}/system-update.target.wants/dnf-system-upgrade.service %endif %if %{with yumutils} @@ -786,6 +820,27 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/ %endif %changelog +* Wed Mar 15 2023 Marek Blaha - 4.3.0-5 +- Update translations + +* Fri Jan 06 2023 Nicola Sella - 4.3.0-4 +- Remove requirement of python3-distro (fix specfile) + +* Thu Jan 05 2023 Nicola Sella - 4.3.0-3 +- Remove requirement of python3-distro + +* Wed Dec 03 2022 Nicola Sella - 4.3.0-2 +- Move system-upgrade plugin to core (RhBug:2054235) +- offline-upgrade: add support for security filters (RhBug:1939975) + +* Thu Sep 22 2022 Lukas Hrazky - 4.3.0-1 +- Update to 4.3.0 +- [config-manager] Update documentation (RhBug:2075366) +- [builddep] Warning when using macros with source rpms (RhBug:2077820) +- [repomanage] Use modules only from repo they are handling (RhBug:2072441) +- Skip all non rpm transaction items for transaction_action plugins (rhbug:2023652) +- feat(repomanage): Add new option --oldonly + * Wed Sep 14 2022 Marek Blaha - 4.1.0-3 - Update translations