Merge ubuntu-release-upgrader:server-mode-check into ubuntu-release-upgrader:ubuntu/main

[Brian Murray]

Looking at the calls to self.cache.need_server_mode() in DistUpgradeController.py one of them can do more harm than good by switching from a "desktop" mode upgrade to a "server" mode upgrade. This changes that by only calling the function again if "server" mode is already set.

I tested an upgrade of an Ubuntu 20.04 server install with this change and it worked without issue. Additionally, I tested a desktop upgrade of Ubuntu 22.04 (only the calculation of the DistUpgrade) and it also worked without an issue.

It might also be necessary to reset `os.environ["RELEASE_UPGRADE_MODE"]`, however it looks like there is an existing bug with it not being set after changing mode.

[Julian Andres Klode (juliank)]

Please rebase and fix the conflicts, this is not reviewable as is.

review: Needs Fixing

Unmerged commits

08d5ee7... by Brian Murray on 2022-08-12

Don't crash if there are no tasks

f29699a... by Brian Murray on 2022-08-12

Only switch from server to desktop not vice versa

742e630... by Brian Murray on 2022-08-03

Add more words to the changelog entry.

63ceabe... by Brian Murray on 2022-08-02

Fix the version variable

0e96c23... by Brian Murray on 2022-08-02

Clarify a variable name

c58ed3c... by Brian Murray on 2022-08-02

The upgrade should exit if we can't install the metapkg

c3cc804... by Brian Murray on 2022-08-02

Fix a typo

9a45503... by Simon Chopin on 2022-08-01

quirk: fix nvidia driver autoremoval issue

The 20.04.3 installer somehow removed the nvidia-driver-* metapackage,
leaving the actual driver packages as marked for autoremoval. If we
detect this situation, we silently fix it.

Related to LP: #1955047

04e7db4... by Brian Murray on 2022-07-19

releasing package ubuntu-release-upgrader version 1:22.04.12

b0ad9f0... by Brian Murray on 2022-07-19

tests/test_quirks.py: Remove declaration of unused variables

diff --git a/DistUpgrade/DistUpgradeController.py b/DistUpgrade/DistUpgradeController.py
index 7fe796e..2d680b8 100644
--- a/DistUpgrade/DistUpgradeController.py
+++ b/DistUpgrade/DistUpgradeController.py
@@ -1097,7 +1097,10 @@ class DistUpgradeController(object):
             return False
 
         if self.serverMode:
-            if not self.cache.installTasks(self.tasks):
+            if hasattr(self, 'tasks'):
+                if not self.cache.installTasks(self.tasks):
+                    return False
+            else:
                 return False
 
         # show changes and confirm
@@ -1893,7 +1896,9 @@ class DistUpgradeController(object):
             # re-check server mode because we got new packages (it may happen
             # that the system had no sources.list entries and therefore no
             # desktop file information)
-            self.serverMode = self.cache.need_server_mode()
+            # switch from server to desktop but not the other way
+            if self.serverMode:
+                self.serverMode = self.cache.need_server_mode()
             # do it here as we need to know if we are in server or client mode
             self.quirks.ensure_recommends_are_installed_on_desktops()
             # now check if we still have some key packages available/downloadable
diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index 034cc77..0cb4e4f 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -122,6 +122,7 @@ class DistUpgradeQuirks(object):
 
         cache = self.controller.cache
         self._test_and_warn_if_ros_installed(cache)
+        self._fix_missing_nvidia_metapackage()
 
         if 'snapd' not in cache:
             logging.debug("package required for Quirk not in cache")
@@ -151,6 +152,7 @@ class DistUpgradeQuirks(object):
         if 'linux-firmware-raspi2' in cache:
             if cache['linux-firmware-raspi2'].is_installed:
                 self._remove_uboot_on_rpi()
+                self._remove_netplan_match_rpi()
 
     # individual quirks handler when the dpkg run is finished ---------
     def PostCleanup(self):
@@ -1377,3 +1379,110 @@ class DistUpgradeQuirks(object):
         except IOError as exc:
             logging.error("unable to write new boot config to %s: %s; %s",
                           boot_config_filename, exc, failure_action)
+
+    def _remove_netplan_match_rpi(self, netplan_dir='/etc/netplan'):
+        failure_action = (
+            "You may need to manually edit your netplan config "
+            "and remove the line \"driver: bcmgenet smsc95xx lan78xx\". "
+            "See LP: #1970761 for further details")
+
+        try:
+            import yaml
+        except ImportError:
+            logging.error("failed to import yaml library. %s", failure_action)
+            return
+
+        for netplan_config_file in glob.glob("%s/*.yaml" % netplan_dir):
+            try:
+                netplan_config_filename = os.path.join(netplan_dir,
+                                                       netplan_config_file)
+                with open(netplan_config_filename, 'r', encoding='utf-8') as f:
+                    orig_content = f.read()
+                    netplan_yaml = yaml.load(orig_content,
+                                             Loader=yaml.SafeLoader)
+
+            except FileNotFoundError:
+                logging.error("failed to open netplan configuration in %s; %s",
+                              netplan_config_filename, failure_action)
+                return
+
+            file_modified = False
+            try:
+                for eth in netplan_yaml["network"]["ethernets"].values():
+                    if eth["match"]["driver"] == "bcmgenet smsc95xx lan78xx":
+                        file_modified = True
+                        del eth["match"]
+                        if "set-name" in eth:
+                            del eth["set-name"]
+            except KeyError:
+                continue
+
+            if not file_modified:
+                continue
+
+            try:
+                netplan_backup_filename = (netplan_config_filename +
+                                           '.distUpgrade')
+                with open(netplan_backup_filename, 'w', encoding='utf-8') as f:
+                    f.write(orig_content)
+            except IOError as exc:
+                logging.error("unable to write netplan config backup to "
+                              "%s: %s; %s",
+                              netplan_backup_filename, exc, failure_action)
+                return
+            try:
+                with open(netplan_config_filename, 'w', encoding='utf-8') as f:
+                    yaml.dump(netplan_yaml, f, default_flow_style=False)
+            except IOError as exc:
+                logging.error("unable to write new netplan config to "
+                              "%s: %s; %s",
+                              netplan_config_filename, exc, failure_action)
+                return
+
+    def _fix_missing_nvidia_metapackage(self):
+        # LP: #1955047
+        # Desktop installs for 20.04.3 on systems with nvidia graphics don't have the
+        # driver metapackage installed
+        logging.debug("running Quirks._test_and_fix_missing_nvidia_metapackage")
+        try:
+            from NvidiaDetector.nvidiadetector import NvidiaDetection
+        except (ImportError) as e:
+            logging.error("NvidiaDetection can not be imported %s" % e)
+            return
+        nv = NvidiaDetection()
+        versions = nv.drivers.keys()
+        cache = self.controller.cache
+        # Early exit if there's a driver metapackage installed
+        for version in versions:
+            driver = 'nvidia-driver-{}'.format(version)
+            if driver in cache and cache[driver].is_installed:
+                logging.debug("package {} detected, exit.".format(driver))
+                return
+        version_to_fix = None
+        # If we find an autoremovable libnvidia-gl package, this probably means the user
+        # hit LP: #1955047
+        for version in versions:
+            nvidia_gl = 'libnvidia-gl-{}'.format(version)
+            if nvidia_gl in cache and cache[nvidia_gl].is_installed and cache[nvidia_gl].is_auto_removable:
+                version_to_fix = version
+                logging.debug("Found autoremovable package {}, assuming we're missing nvidia-driver-{}".format(nvidia_gl, version))
+                break
+        if version_to_fix is None:
+            logging.debug("No autoremovable libnvidia-gl found, exiting.")
+            return
+        missing_metapackage = "nvidia-driver-{}".format(version_to_fix)
+        if missing_metapackage not in cache:
+            logging.error("Package {} not available in the APT cache!".format(missing_metapackage))
+            summary = _("NVIDIA driver metapackage unavailable")
+            msg = _("Your system has the package libnvidia-gl-%s installed "
+                    "but the corresponding metapackage nvidia-driver-%s is "
+                    "not installed and is not available to be installed. "
+                    "The upgrade process was not able to automatically fix "
+                    "this issue and consequently the upgrade will now exit." %
+                    (version_to_fix, version_to_fix))
+            self._view.error(summary, msg)
+            self.controller.abort()
+            return
+        logging.debug("Installing missing nvidia driver metapackage {}".format(missing_metapackage))
+        cache[missing_metapackage].mark_install()
+        cache.commit(None, None)
diff --git a/DistUpgrade/DistUpgradeVersion.py b/DistUpgrade/DistUpgradeVersion.py
index be51958..1c25d45 100644
--- a/DistUpgrade/DistUpgradeVersion.py
+++ b/DistUpgrade/DistUpgradeVersion.py
@@ -1 +1,5 @@
+<<<<<<< DistUpgrade/DistUpgradeVersion.py
 VERSION = '22.10.6'
+=======
+VERSION = '22.04.12'
+>>>>>>> DistUpgrade/DistUpgradeVersion.py
diff --git a/data/DistUpgrade.cfg.groovy b/data/DistUpgrade.cfg.groovy
new file mode 100644
index 0000000..cb53d63
--- /dev/null
+++ b/data/DistUpgrade.cfg.groovy
@@ -0,0 +1,131 @@
+[View]
+# the views will be tried in this order, if one fails to import, the next
+# is tried
+View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
+#View=DistUpgradeViewNonInteractive
+#Depends= apt (>= 1.0.10.2ubuntu2)
+# the views below support upgrades over ssh connection
+SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
+
+# Distro contains global information about the upgrade
+[Distro]
+# the meta-pkgs we support
+MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-core,
+   xubuntu-desktop, ubuntustudio-desktop, mythbuntu-desktop,
+   kubuntu-netbook, lubuntu-desktop, ubuntu-gnome-desktop,
+   ubuntu-mate-core, ubuntu-mate-desktop,
+   ubuntukylin-desktop, ubuntu-budgie-desktop
+BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
+# minimal & standard, are handed via BaseMetaPkgs rule
+# ubuntu-core is left-over task we forgot to remove
+IgnoredTasks=minimal, standard, ubuntu-core
+Demotions=demoted.cfg.groovy
+#RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
+RemovalDenylistFile=removal_denylist.cfg
+# if those packages were installed, make sure to keep them installed
+KeepInstalledPkgs=xserver-xorg-video-all
+KeepInstalledSection=translations
+RemoveObsoletes=yes
+PurgeObsoletes=yes
+#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
+# hints for for stuff that should be done right after the cache calculated
+# the dist-upgrade (not to be confused with the PostUpgrade hooks in the
+# quirks handling)
+#PostUpgradePurge=linux-restricted-modules-common
+#PostUpgradeRemove=xsettings-kde
+#PostUpgradeUpgrade=brasero,edubuntu-desktop
+#PostUpgradeInstall=apt
+PostInstallScripts=./xorg_fix_proprietary.py
+EnableApport=yes
+# this supported deny listing certain versions to ensure we do not upgrade
+#  - blcr-dkms fails to build on kernel 2.6.35
+#BadVersions=blcr-dkms_0.8.2-13
+# ubiquity slideshow
+#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
+
+# information about the individual meta-pkgs
+[ubuntu-desktop]
+KeyDependencies=lightdm, unity, ubuntu-artwork, ubuntu-sounds
+# those pkgs will be marked remove right after the distUpgrade in the cache
+PostUpgradeRemove=gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
+ForcedObsoletes=desktop-effects, gnome-app-install, policykit-gnome, gnome-mount
+
+[kubuntu-desktop]
+KeyDependencies=plasma-desktop, kubuntu-settings-desktop
+PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager, kmix
+# those packages are marked as obsolete right after the upgrade
+ForcedObsoletes=ivman, gtk-qt-engine
+# help the resolver a bit: LP: #1426132
+PostUpgradeInstall=baloo-kf5
+
+[kubuntu-netbook]
+KeyDependencies=plasma-netbook, kubuntu-settings-netbook
+
+[ubuntu-netbook]
+KeyDependencies=gdm, ubuntu-netbook-default-settings
+
+[xubuntu-core]
+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
+PostUpgradeRemove=notification-daemon
+
+[xubuntu-desktop]
+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
+PostUpgradeRemove=notification-daemon
+
+[ubuntustudio-desktop]
+KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look
+
+[ichthux-desktop]
+KeyDependencies=ichthux-artwork, ichthux-default-settings
+
+[mythbuntu-desktop]
+KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings
+
+[lubuntu-desktop]
+KeyDependencies=lubuntu-artwork, lubuntu-default-settings
+
+[ubuntu-gnome-desktop]
+KeyDependencies=ubuntu-gnome-default-settings, ubuntu-gnome-wallpapers
+
+[ubuntu-mate-core]
+KeyDependencies=mate-desktop-environment-core, ubuntu-mate-default-settings, marco
+PostUpgradeRemove=ibus,lightdm-gtk-greeter,lightdm-gtk-greeter-settings
+
+[ubuntu-mate-desktop]
+KeyDependencies=ubuntu-mate-core, deja-dup-caja
+PostUpgradeRemove=ibus,lightdm-gtk-greeter,lightdm-gtk-greeter-settings
+
+[ubuntukylin-desktop]
+KeyDependencies=ubuntukylin-keyring, ubuntukylin-wallpapers, ubuntu-kylin-docs
+
+[ubuntu-budgie-desktop]
+KeyDependencies=budgie-desktop-environment, budgie-welcome, ubuntu-budgie-themes
+
+[Files]
+BackupExt=distUpgrade
+LogDir=/var/log/dist-upgrade/
+
+[Sources]
+From=groovy
+To=jammy
+ValidOrigin=Ubuntu
+ValidMirrors = mirrors.cfg
+Components=main,restricted,universe,multiverse
+Pockets=security,updates,proposed,backports
+;AllowThirdParty=False
+
+;[PreRequists]
+;Packages=release-upgrader-apt,release-upgrader-dpkg
+;SourcesList=prerequists-sources.list
+;SourcesList-ia64=prerequists-sources.ports.list
+;SourcesList-hppa=prerequists-sources.ports.list
+
+[Network]
+MaxRetries=3
+
+[NonInteractive]
+ForceOverwrite=yes
+RealReboot=no
+DebugBrokenScripts=no
+DpkgProgressLog=no
+;TerminalTimeout=2400
diff --git a/data/DistUpgrade.cfg.hirsute b/data/DistUpgrade.cfg.hirsute
new file mode 100644
index 0000000..4f2fa65
--- /dev/null
+++ b/data/DistUpgrade.cfg.hirsute
@@ -0,0 +1,131 @@
+[View]
+# the views will be tried in this order, if one fails to import, the next
+# is tried
+View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
+#View=DistUpgradeViewNonInteractive
+#Depends= apt (>= 1.0.10.2ubuntu2)
+# the views below support upgrades over ssh connection
+SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
+
+# Distro contains global information about the upgrade
+[Distro]
+# the meta-pkgs we support
+MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-core,
+   xubuntu-desktop, ubuntustudio-desktop, mythbuntu-desktop,
+   kubuntu-netbook, lubuntu-desktop, ubuntu-gnome-desktop,
+   ubuntu-mate-core, ubuntu-mate-desktop,
+   ubuntukylin-desktop, ubuntu-budgie-desktop
+BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
+# minimal & standard, are handed via BaseMetaPkgs rule
+# ubuntu-core is left-over task we forgot to remove
+IgnoredTasks=minimal, standard, ubuntu-core
+Demotions=demoted.cfg.hirsute
+#RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
+RemovalDenylistFile=removal_denylist.cfg
+# if those packages were installed, make sure to keep them installed
+KeepInstalledPkgs=xserver-xorg-video-all
+KeepInstalledSection=translations
+RemoveObsoletes=yes
+PurgeObsoletes=yes
+#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
+# hints for for stuff that should be done right after the cache calculated
+# the dist-upgrade (not to be confused with the PostUpgrade hooks in the
+# quirks handling)
+#PostUpgradePurge=linux-restricted-modules-common
+#PostUpgradeRemove=xsettings-kde
+#PostUpgradeUpgrade=brasero,edubuntu-desktop
+#PostUpgradeInstall=apt
+PostInstallScripts=./xorg_fix_proprietary.py
+EnableApport=yes
+# this supported deny listing certain versions to ensure we do not upgrade
+#  - blcr-dkms fails to build on kernel 2.6.35
+#BadVersions=blcr-dkms_0.8.2-13
+# ubiquity slideshow
+#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
+
+# information about the individual meta-pkgs
+[ubuntu-desktop]
+KeyDependencies=lightdm, unity, ubuntu-artwork, ubuntu-sounds
+# those pkgs will be marked remove right after the distUpgrade in the cache
+PostUpgradeRemove=gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
+ForcedObsoletes=desktop-effects, gnome-app-install, policykit-gnome, gnome-mount
+
+[kubuntu-desktop]
+KeyDependencies=plasma-desktop, kubuntu-settings-desktop
+PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager, kmix
+# those packages are marked as obsolete right after the upgrade
+ForcedObsoletes=ivman, gtk-qt-engine
+# help the resolver a bit: LP: #1426132
+PostUpgradeInstall=baloo-kf5
+
+[kubuntu-netbook]
+KeyDependencies=plasma-netbook, kubuntu-settings-netbook
+
+[ubuntu-netbook]
+KeyDependencies=gdm, ubuntu-netbook-default-settings
+
+[xubuntu-core]
+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
+PostUpgradeRemove=notification-daemon
+
+[xubuntu-desktop]
+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
+PostUpgradeRemove=notification-daemon
+
+[ubuntustudio-desktop]
+KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look
+
+[ichthux-desktop]
+KeyDependencies=ichthux-artwork, ichthux-default-settings
+
+[mythbuntu-desktop]
+KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings
+
+[lubuntu-desktop]
+KeyDependencies=lubuntu-artwork, lubuntu-default-settings
+
+[ubuntu-gnome-desktop]
+KeyDependencies=ubuntu-gnome-default-settings, ubuntu-gnome-wallpapers
+
+[ubuntu-mate-core]
+KeyDependencies=mate-desktop-environment-core, ubuntu-mate-default-settings, marco
+PostUpgradeRemove=ibus,lightdm-gtk-greeter,lightdm-gtk-greeter-settings
+
+[ubuntu-mate-desktop]
+KeyDependencies=ubuntu-mate-core, deja-dup-caja
+PostUpgradeRemove=ibus,lightdm-gtk-greeter,lightdm-gtk-greeter-settings
+
+[ubuntukylin-desktop]
+KeyDependencies=ubuntukylin-keyring, ubuntukylin-wallpapers, ubuntu-kylin-docs
+
+[ubuntu-budgie-desktop]
+KeyDependencies=budgie-desktop-environment, budgie-welcome, ubuntu-budgie-themes
+
+[Files]
+BackupExt=distUpgrade
+LogDir=/var/log/dist-upgrade/
+
+[Sources]
+From=hirsute
+To=jammy
+ValidOrigin=Ubuntu
+ValidMirrors = mirrors.cfg
+Components=main,restricted,universe,multiverse
+Pockets=security,updates,proposed,backports
+;AllowThirdParty=False
+
+;[PreRequists]
+;Packages=release-upgrader-apt,release-upgrader-dpkg
+;SourcesList=prerequists-sources.list
+;SourcesList-ia64=prerequists-sources.ports.list
+;SourcesList-hppa=prerequists-sources.ports.list
+
+[Network]
+MaxRetries=3
+
+[NonInteractive]
+ForceOverwrite=yes
+RealReboot=no
+DebugBrokenScripts=no
+DpkgProgressLog=no
+;TerminalTimeout=2400
diff --git a/data/demoted.cfg.groovy b/data/demoted.cfg.groovy
new file mode 120000
index 0000000..65db89e
--- /dev/null
+++ b/data/demoted.cfg.groovy
@@ -0,0 +1 @@
+../utils/demoted.cfg.groovy
\ No newline at end of file
diff --git a/data/demoted.cfg.hirsute b/data/demoted.cfg.hirsute
new file mode 120000
index 0000000..b3ba87b
--- /dev/null
+++ b/data/demoted.cfg.hirsute
@@ -0,0 +1 @@
+../utils/demoted.cfg.hirsute
\ No newline at end of file
diff --git a/data/mirrors.cfg b/data/mirrors.cfg
index ae29179..a591b41 100644
--- a/data/mirrors.cfg
+++ b/data/mirrors.cfg
@@ -125,7 +125,6 @@ http://ucho.ignum.cz/ubuntu/
 http://ftp.tudelft.nl/archive.ubuntu.com/
 http://ftp.acc.umu.se/ubuntu/
 http://ftp.snt.utwente.nl/pub/os/linux/ubuntu/
-http://mirror.pnl.gov/ubuntu/
 http://ubuntu.mirror.tudos.de/ubuntu/
 http://ftp.byfly.by/ubuntu/
 http://mirror.datacenter.by/ubuntu/
@@ -271,7 +270,6 @@ http://mirrors.nxthost.com/ubuntu/
 http://mirror.xeonbd.com/ubuntu-archive/
 http://ubuntu.colocall.net/ubuntu/
 http://ubuntu.mirror.serverloft.de/ubuntu/
-http://ftp.ntou.edu.tw/ubuntu/
 http://ubuntu.mirrors.linux.ro/archive/
 http://mirror.intergrid.com.au/ubuntu/
 http://mirror.nl.datapacket.com/ubuntu/
@@ -309,7 +307,6 @@ http://mirror1.totbb.net/ubuntu/
 http://mirrors.psu.ac.th/ubuntu/
 http://ubuntu.turhost.com/ubuntu/
 http://mirror.hostnet.nl/ubuntu/archive/
-http://mirror-hk.koddos.net/ubuntu/
 http://mirror.uoregon.edu/ubuntu/
 http://ubuntu.mirrors.theom.nz/
 http://mirror.operationtulip.com/ubuntu/
@@ -423,8 +420,6 @@ http://mirror.easyname.at/ubuntu-archive/
 http://ftp.ntua.gr/ubuntu/
 https://mirrors.switch.ca/ubuntu/
 http://ftp.caliu.cat/pub/distribucions/ubuntu/archive/
-https://ftp.harukasan.org/ubuntu/
-https://ftp.harukasan.org/ubuntu-ports/
 https://mirror.dogado.de/ubuntu/
 https://quantum-mirror.hu/mirrors/pub/ubuntu/
 https://mirror.kku.ac.th/ubuntu/
@@ -466,7 +461,6 @@ https://nyc.mirrors.clouvider.net/ubuntu/
 https://mirror.telepoint.bg/ubuntu/
 https://mirror.de.vangus.co.il/ubuntu/
 https://mirror.nl.bontekoe.technology/ubuntu/
-https://ubuntu.unlimited.rs/
 https://ubuntu.ch.altushost.com/
 https://mirror.sabay.com.kh/ubuntu/
 http://mirrors.dgut.edu.cn/ubuntu/
@@ -517,7 +511,6 @@ https://mirror.uepg.br/ubuntu/
 https://mirror.23m.com/ubuntu/
 https://dal.mirrors.clouvider.net/ubuntu/
 http://repos.del.extreme-ix.org/ubuntu/
-http://ftp.vectranet.pl/ubuntu/
 https://buaya.klas.or.id/ubuntu/
 https://ubuntu.netforce.hosting/ubuntu/
 https://repo.ialab.dsu.edu/ubuntu/
@@ -589,7 +582,6 @@ http://mirror.cloudxchange.id/ubuntu/
 http://mirror.dlut.edu.cn/ubuntu/
 https://mirror.vpsnet.com/ubuntu/
 https://ftp.ulak.net.tr/ubuntu/
-https://ftp.udx.icscoe.jp/Linux/ubuntu/
 https://mirror.dal.nexril.net/ubuntu/
 https://mirror.gi.co.id/ubuntu/
 http://mirrors.piconets.webwerks.in/ubuntu-mirror/ubuntu/
@@ -602,6 +594,7 @@ https://mirror.cxserv.de/ubuntu/
 https://mirror.cs.pitt.edu/ubuntu/archive/
 https://mirror.fcix.net/ubuntu/
 http://mirror.labkom.id/ubuntu/
+<<<<<<< data/mirrors.cfg
 https://mirror.netsite.dk/ubuntu/archive/
 https://mirrors.storpool.com/ubuntu/archive/
 https://ubuntu.mirrors.orange.ro/ubuntu-archive/
@@ -641,3 +634,42 @@ https://mirror1.grupocg.cl/ubuntu/
 http://mirror.unej.ac.id/ubuntu/
 https://mirror.lstn.net/ubuntu/
 https://mirror.alwyzon.net/ubuntu/
+=======
+https://mirror.hep.gg/ubuntu/
+https://mirror.netsite.dk/ubuntu/archive/
+https://mirror.kkg.berlin/ubuntu/
+https://mirror.highland-networks.com/ubuntu/
+https://ubuntu-repos.bom.anuragbhatia.com/
+https://ubuntu.mirrors.orange.ro/ubuntu-archive/
+https://mirror.lostpacket.org/cdn/ubuntu/
+https://mirror.mia.velocihost.net/ubuntu/
+http://mirror.onevip.mk/ubuntu/
+http://mirror.cedille.club/ubuntu/
+https://mirrors.storpool.com/ubuntu/archive/
+https://mirror.clarkson.edu/ubuntu/
+https://mirror.nevacloud.com/ubuntu/ubuntu-archive/
+http://mirror.soonkeat.sg/ubuntu/
+https://ftp.ps.pl/pub/Linux/ubuntu/archive/
+https://mirrors.gbnetwork.com/ubuntu/
+https://mirror.xtx.cloud/ubuntu/
+http://mirror.nerdmilio.com/ubuntu/
+https://mirror.webworld.ie/ubuntu/
+http://ftp.mirror.tw/pub/ubuntu/ubuntu/
+https://it2.mirror.vhosting-it.com/ubuntu/
+https://mirrors.nxtgen.com/ubuntu-mirror/ubuntu/
+http://debian.linux.org.tw/ubuntu/
+http://mirror.serverion.com/ubuntu/
+https://mirrors.nav.ro/ubuntu/
+https://it1.mirror.vhosting-it.com/ubuntu/
+https://mirror.scaleuptech.com/ubuntu/
+https://ubuntu-mirror.magnetic-it.com/ubuntu/
+http://mirror.retentionrange.co.bw/ubuntu/
+http://mirror.lnx-solutions.com/ubuntu/
+https://mirror.lstn.net/ubuntu/
+https://mirror1.grupocg.cl/ubuntu/
+http://mirror.unej.ac.id/ubuntu/
+http://mirrors.evoluso.com/ubuntu/
+https://ubuntu.hi.no/archive/
+https://mirror.alwyzon.net/ubuntu/
+https://mirrors.xjtu.edu.cn/ubuntu/
+>>>>>>> data/mirrors.cfg
diff --git a/debian/changelog b/debian/changelog
index 08bbb6d..1563364 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 ubuntu-release-upgrader (1:22.10.6) kinetic; urgency=medium
 
   * utils/demotions.py: check old-releases.u.c so that we can generate
@@ -47,6 +48,45 @@ ubuntu-release-upgrader (1:22.10.1) kinetic; urgency=medium
   * Run pre-build.sh: updating mirrors, demotions, and translations.
 
  -- Nick Rosbrook <[e-mail]>  Thu, 28 Apr 2022 13:56:43 -0700
+=======
+ubuntu-release-upgrader (1:22.04.13) UNRELEASED; urgency=medium
+
+  * Add a quirk to resolve an issue where the nvidia driver would get
+    suggested for autoremoval. (LP: #1955047)
+
+ -- Simon Chopin <[e-mail]>  Tue, 02 Aug 2022 15:45:26 +0200
+
+ubuntu-release-upgrader (1:22.04.12) jammy; urgency=medium
+
+  [ Brian Murray ]
+  * Add support for upgrading from End of Life releases (Ubuntu 20.10 and
+    Ubuntu 21.04) to Ubuntu 22.04. (LP: #1975533)
+  * DistUpgrade: Do not attempt to reboot in WSL. (LP: #1958668)
+  * DistUpgrade/deb2snap.json: gnome-3-34-1804 is no longer a seeded snap and
+    should not be refreshed. (LP: #1981485)
+  * Run pre-build.sh: updating mirrors, demotions, and translations.
+
+  [ William 'jawn-smith' Wilson ]
+  * tests/test_quirks.py: Remove declaration of unused variables
+
+ -- Brian Murray <[e-mail]>  Tue, 19 Jul 2022 06:52:28 -0700
+
+ubuntu-release-upgrader (1:22.04.11) jammy; urgency=medium
+
+  [ William 'jawn-smith' Wilson ]
+  * DistUpgrade/DistUpgradeQuirks.py: Remove section of netplan
+    config that is installed by default on Raspberry Pi and
+    causes netplan failures after upgrade to jammy (LP: #1970761)
+
+  [ Nick Rosbrook ]
+  * DistUpgrade: Gracefully handle missing dbus module (LP: #1965568).
+  * DistUpgrade: Do not show lock screen error if XDG_SESSION_TYPE is
+    tty (LP: #1973785).
+  * DistUpgrade: Add deb2snap entry for snapd-desktop-integration (LP: #1975747).
+  * Run pre-build.sh: updating mirrors, demotions, and translations.
+
+ -- Nick Rosbrook <[e-mail]>  Thu, 26 May 2022 10:49:26 -0400
+>>>>>>> debian/changelog
 
 ubuntu-release-upgrader (1:22.04.10) jammy; urgency=medium
 
diff --git a/debian/control b/debian/control
index 1e9dcf6..1ef4a0e 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,7 @@ Depends: ${python3:Depends},
          python3-apt (>= 0.8.5~),
          python3-dbus,
          python3-distro-info,
+         python3-yaml,
          gpgv,
          lsb-release,
          sensible-utils,
diff --git a/debian/tests/control b/debian/tests/control
index 3e0fa69..222ddfb 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
 Tests: nose-tests
-Depends: @, gir1.2-webkit2-4.0, python3-mock, python3-nose, xvfb, python3-apport, pycodestyle
+Depends: @, gir1.2-webkit2-4.0, python3-mock, python3-nose, xvfb, python3-apport, pycodestyle, python3-yaml
diff --git a/po/af.po b/po/af.po
index f823f0b..bd2ae1d 100644
--- a/po/af.po
+++ b/po/af.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/af.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/af.po
 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
 "Last-Translator: Brian Murray <[e-mail]>\n"
 "Language-Team: Afrikaans <[e-mail]>\n"
@@ -1056,12 +1060,12 @@ msgstr "Plaas asseblief '%s' in dryf '%s'"
 msgid "Media Change"
 msgstr "Media verwisseling"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 "Jou grafika apparatuur is dalk nie ten volle ondersteun in Ubuntu 14.04."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -1076,13 +1080,13 @@ msgstr ""
 "inligting, sien https://wiki.ubuntu.com/X/Bugs/"
 "UpdateManagerWarningForUnity3D Wil jy steeds voortgaan met die opgrader?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 "Jou grafikahardeware is dalk nie ten volle ondersteun in Ubuntu 12,04 LTS "
 "nie."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -1094,7 +1098,7 @@ msgstr ""
 "sien https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Wil jy "
 "voortgaan met die opgrader?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -1102,7 +1106,7 @@ msgstr ""
 "Opgradering kan dalk werkskerm effekte en werkverrigting in speletjies en "
 "ander grafies intensiewe programme verminder."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -1116,12 +1120,12 @@ msgstr ""
 "\n"
 "Wil jy voortgaan?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr "Jammer, geen opgraderings meer vir hierdie stelsel nie"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -1134,11 +1138,11 @@ msgstr ""
 "\n"
 "Opdaterings vir Ubuntu %s sal voortgaan tot %s."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr "Geen ARMv6 verwerker"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1150,12 +1154,12 @@ msgstr ""
 "argitektuur. Dit is nie moontlik om jou stelsel op te gradeer na 'n nuwe "
 "Ubuntu vrystelling met hierdie hardeware."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -1165,7 +1169,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, fuzzy, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1178,11 +1182,11 @@ msgstr ""
 "\n"
 "Opdaterings vir Ubuntu %s sal voortgaan tot %s."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr "Geen init beskikbaar"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1198,11 +1202,11 @@ msgstr ""
 "\n"
 "Is jy seker jy wil voortgaan?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1219,12 +1223,12 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 #, fuzzy
 msgid "Connection to the Snap Store failed"
 msgstr "Verbinding aan snap Winkel gefaal"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1234,11 +1238,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr "Verbinding aan snap Winkel gefaal"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1250,11 +1254,11 @@ msgstr ""
 "io.\n"
 "Wil jy steeds voortgaan met die opgradering?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr "Verouderde snapd pakket"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1266,34 +1270,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr "Berekening van snap grootte vereistes"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr "Verwerking snap plaasvervangers"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr "verfris snap %s"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, fuzzy, python-format
 msgid "removing snap %s"
 msgstr "verfris snap %s"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr "installeer snap %s"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr "PAE nie geaktiveer"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1305,11 +1309,11 @@ msgstr ""
 "weergawe van Ubuntu, moet jy PAE (indien dit moontlik is) sien:\n"
 "http://help.ubuntu.com/community/EnablingPAE"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1321,7 +1325,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr "Kontrolering vir geïnstalleerde snaps"
 
diff --git a/po/am.po b/po/am.po
index 5d57dbd..fcdcc2b 100644
--- a/po/am.po
+++ b/po/am.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/am.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/am.po
 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
 "Last-Translator: Brian Murray <[e-mail]>\n"
 "Language-Team: Amharic <[e-mail]>\n"
@@ -961,11 +965,11 @@ msgstr "እባክዎ ያስገቡ '%s' በመንጂያው ውስጥ '%s'"
 msgid "Media Change"
 msgstr "የሜዲያ ለውጥ"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr "የ እርስዎ graphics ጠንካራ አክል ሙሉ በ ሙሉ የ ተደገፈ ላይሆን ይችላል በ ኡቡንቱ 14.04."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -979,11 +983,11 @@ msgstr ""
 "መረጃ ይህን ይመልከቱ:  https://wiki.ubuntu.com/X/Bugs/"
 "UpdateManagerWarningForUnity3D እርስዎ ማሻሻሉን መቀጠል ይፈልጋሉ?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr "የ እርስዎ graphics hardware በ ሙሉ የተደገፈ አይደለም በ ኡቡንቱ 12.04 LTS."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -994,7 +998,7 @@ msgstr ""
 "ሊያጋጥምዎት ይችላል ከ ተሻሻለ በኋላ: ለ በለጠ መረጃ ይህን ይመልከቱ https://wiki.ubuntu.com/X/Bugs/"
 "UpdateManagerWarningForI8xx እርስዎ ማሻሻሉን መቀጠል ይፈልጋሉ?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -1002,7 +1006,7 @@ msgstr ""
 "ማሻሻል የ ዴስክቶፕ ውጤቶችን ሊቀንስ ይችላል: ጨዋታዎች በሚጫወቱ ጊዜ ወይንም ሀይለኛ graphics ፕሮግራሞችን "
 "በሚጠቀሙ ጊዜ"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -1015,12 +1019,12 @@ msgstr ""
 "\n"
 "እርስዎ በ እርግጥ መቀጠል ይፈልጋሉ?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -1029,11 +1033,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr "No ARMv6 CPU"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1041,12 +1045,12 @@ msgid ""
 "Ubuntu release with this hardware."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -1056,7 +1060,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1065,11 +1069,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr "ምንም ማስጀመሪያ ዝግጁ አይደለም"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1079,11 +1083,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1100,11 +1104,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1114,11 +1118,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1126,11 +1130,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1139,34 +1143,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr "PAE አላስቻሉም"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1178,11 +1182,11 @@ msgstr ""
 "ከሆነ) ይህን ይመልከቱ:\n"
 "http://help.ubuntu.com/community/EnablingPAE"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1194,7 +1198,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/an.po b/po/an.po
index 29e09aa..fe33501 100644
--- a/po/an.po
+++ b/po/an.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/an.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/an.po
 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
 "Last-Translator: Daniel Martinez <[e-mail]>\n"
 "Language-Team: Aragonese <[e-mail]>\n"
@@ -908,11 +912,11 @@ msgstr ""
 msgid "Media Change"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -922,11 +926,11 @@ msgid ""
 "upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -934,13 +938,13 @@ msgid ""
 "continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -949,12 +953,12 @@ msgid ""
 "Do you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -963,11 +967,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -975,12 +979,12 @@ msgid ""
 "Ubuntu release with this hardware."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -990,7 +994,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -999,11 +1003,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1013,11 +1017,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1034,11 +1038,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1048,11 +1052,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1060,11 +1064,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1073,34 +1077,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1108,11 +1112,11 @@ msgid ""
 "http://help.ubuntu.com/community/EnablingPAE"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1124,7 +1128,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/ar.po b/po/ar.po
index d932145..1620789 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,7 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po_update-manager-ar\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/ar.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/ar.po
 "PO-Revision-Date: 2019-06-18 17:52+0000\n"
 "Last-Translator: Ibrahim Saed <[e-mail]>\n"
 "Language-Team: Arabic\n"
@@ -1002,11 +1006,11 @@ msgstr "رجاء أدرج '%s' في محرك الأقراص '%s'"
 msgid "Media Change"
 msgstr "تغيير الوسائط"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr "قد يكون عتاد الرسوميات في جهازك ليس مدعوما بالكامل في أوبونتو 14.04."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -1021,11 +1025,11 @@ msgstr ""
 "Bugs/UpdateManagerWarningForUnity3D\r\n"
 "هل ما زلت ترغب بالاستمرار في الترقية؟"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr "قد يكون عتاد الرسوميات في جهازك غير مدعوم بالكامل في أوبنتو 12.04."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -1036,7 +1040,7 @@ msgstr ""
 "لمزيد من المعلومات انظر: https://wiki.ubuntu.com/X/Bugs/"
 "UpdateManagerWarningForI8xx هل تود الاستمرار في الترقية؟"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -1044,7 +1048,7 @@ msgstr ""
 "قد تقلل الترقية من تأثيرات سطح المكتب، وأداء الألعاب وبرامج الرسوميات "
 "المكثفة الأخرى."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -1057,12 +1061,12 @@ msgstr ""
 "\n"
 "أتريد المواصلة؟"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -1071,11 +1075,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr "لا معالج ARMv6"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1086,12 +1090,12 @@ msgstr ""
 "مبنية لتعمل على الطراز ARMv6 كحد أدنى. من غير الممكن ترقية نظامك إلى إصدارة "
 "أوبونتو حديثة مع هذا العتاد."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -1101,7 +1105,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1110,11 +1114,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr "لا يوجد عفريت مدير للعمليات"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1129,11 +1133,11 @@ msgstr ""
 "\n"
 "هل حقاً تريد الاستمرار؟"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1150,11 +1154,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1164,11 +1168,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1176,11 +1180,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1189,34 +1193,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1224,11 +1228,11 @@ msgid ""
 "http://help.ubuntu.com/community/EnablingPAE"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1240,7 +1244,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/ast.po b/po/ast.po
index 0cab776..bde6d54 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/ast.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/ast.po
 "PO-Revision-Date: 2019-06-18 17:54+0000\n"
 "Last-Translator: ivarela <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
@@ -996,12 +1000,12 @@ msgstr "Por favor, inserta '%s' nel dispositivu '%s'"
 msgid "Media Change"
 msgstr "Cambéu de preséu"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 "Pue que'l so hardware gráficu nun tenga sofitu completu n'Ubuntu 14.04."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -1016,12 +1020,12 @@ msgstr ""
 "obtener más información, consulta https://wiki.ubuntu.com/X/Bugs/"
 "UpdateManagerWarningForUnity3D ¿Aínda quies siguir col anovamientu?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 "El hardware de gráficos nun ye compatible dafechu con Ubuntu 12.04 LTS."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -1033,7 +1037,7 @@ msgstr ""
 "información llei https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx "
 "¿Quies siguir col anovamientu?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -1042,7 +1046,7 @@ msgstr ""
 "rendimientu de los xuegos y otros programes qu'usen gráficos de mou "
 "intensivu."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -1056,12 +1060,12 @@ msgstr ""
 "\n"
 "¿Quier continuar?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -1070,11 +1074,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr "No ARMv6 CPU"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1086,12 +1090,12 @@ msgstr ""
 "ARMv6 como arquiteutura mínima. Nun ye dable anovar el so sistema a la nueva "
 "versión d'Ubuntu con esti hardware."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -1101,7 +1105,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1110,11 +1114,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr "El degorriu init nun ta disponible"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1130,11 +1134,11 @@ msgstr ""
 "\n"
 "¿Daveres que quies siguir?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1151,11 +1155,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1165,11 +1169,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1177,11 +1181,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1190,34 +1194,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr "PAE nun ta activáu"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1229,11 +1233,11 @@ msgstr ""
 "más reciente d'Ubuntu, tien d'activar PAE (si ye posible) vea:\n"
 " http://help.ubuntu.com/community/EnablingPAE"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1245,7 +1249,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/az.po b/po/az.po
index 4676ab0..7e7e021 100644
--- a/po/az.po
+++ b/po/az.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/az.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/az.po
 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
 "Last-Translator: Emin Mastizadeh <[e-mail]>\n"
 "Language-Team: Azerbaijani <[e-mail]>\n"
@@ -893,11 +897,11 @@ msgstr "Xaiş olunur '%s' mənbəyini '%s' sürücüsünə yerləşdirin"
 msgid "Media Change"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -907,11 +911,11 @@ msgid ""
 "upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -919,13 +923,13 @@ msgid ""
 "continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -934,12 +938,12 @@ msgid ""
 "Do you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -948,11 +952,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -960,12 +964,12 @@ msgid ""
 "Ubuntu release with this hardware."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -975,7 +979,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -984,11 +988,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -998,11 +1002,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1019,11 +1023,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1033,11 +1037,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1045,11 +1049,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1058,34 +1062,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1093,11 +1097,11 @@ msgid ""
 "http://help.ubuntu.com/community/EnablingPAE"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1109,7 +1113,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/be.po b/po/be.po
index d1db71f..44f1020 100644
--- a/po/be.po
+++ b/po/be.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/be.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/be.po
 "PO-Revision-Date: 2019-06-18 17:54+0000\n"
 "Last-Translator: Brian Murray <[e-mail]>\n"
 "Language-Team: Belarusian <[e-mail]>\n"
@@ -1002,12 +1006,12 @@ msgstr "Калі ласка, устаўце \"%s\" у прыладу \"%s\""
 msgid "Media Change"
 msgstr "Змена носьбіта"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 "Ваша графічнае абсталяванне не можа быць цалкам падтрыманым ў Ubuntu 14.04."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -1022,13 +1026,13 @@ msgstr ""
 "звесткі гл. https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForUnity3D Вы "
 "ўсё яшчэ хочаце працягнуць абнаўленне?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 "Вашае графічнае абсталяванне, магчыма, не будзе падтрымлівацца цалкам у "
 "Ubuntu 12.04 LTS"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -1040,7 +1044,7 @@ msgstr ""
 "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx \r\n"
 "Вы сапраўды хочаце працягнуць абнаўленне?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -1048,7 +1052,7 @@ msgstr ""
 "Абнаўленне можа выклікаць зніжэнне якасці эфектаў працоўнага стала і "
 "прадукцыйнасці ў гульнях і праграмах, што актыўна выкарыстоўваюць графіку."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -1062,12 +1066,12 @@ msgstr ""
 "\n"
 "Працягнуць?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -1076,11 +1080,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr "Няма працэсара ARMv6"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1092,12 +1096,12 @@ msgstr ""
 "ARMv6 і вышэй. Вашу сістэму немагчыма абнавіць да новага рэлізу Ubuntu з "
 "бягучым апаратным забеспячэннем."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -1107,7 +1111,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1116,11 +1120,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr "Служба init недаступна"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1134,11 +1138,11 @@ msgstr ""
 "\n"
 "Вы ўпэўнены, што хочаце працягнуць?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1155,11 +1159,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1169,11 +1173,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1181,11 +1185,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1194,34 +1198,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr "PAE не ўключана"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1233,11 +1237,11 @@ msgstr ""
 "12.10. Абнаўленне да новай версіі Ubuntu запатрабуе ўключэння PAE (калі гэта "
 "магчыма). Гл.: Http://help.ubuntu.com/community/EnablingPAE"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1249,7 +1253,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 1c3d400..d9bf05d 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/bg.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/bg.po
 "PO-Revision-Date: 2019-06-18 17:55+0000\n"
 "Last-Translator: Brian Murray <[e-mail]>\n"
 "Language-Team: Bulgarian <[e-mail]>\n"
@@ -996,12 +1000,12 @@ msgstr "Моля, поставете диск «%s» в устройство «%
 msgid "Media Change"
 msgstr "Смяна на носител"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 "Вашият графичен хардуер не може да бъде напълно поддържан в Убунту 14.04."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -1016,12 +1020,12 @@ msgstr ""
 "посетете https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForUnity3D. Все "
 "още ли искате да започнете с надграждането?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 "Вашият графичен хардуер може да не се поддържа напълно в Убунту 12.04 LTS."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -1033,7 +1037,7 @@ msgstr ""
 "информация вижте https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx. "
 "Искате ли да продължите с надграждането?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -1041,7 +1045,7 @@ msgstr ""
 "Надграждането може да намали ефектите на работния плот и производителността "
 "в игрите и други графични програми."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -1054,12 +1058,12 @@ msgstr ""
 "\n"
 "Искате ли да продължите?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -1068,11 +1072,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr "Няма ARMv6 процесор"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1083,12 +1087,12 @@ msgstr ""
 "пакети в Karmic бяха оптимизрани с изискване минимум ARMv6 архитектура. Не е "
 "възможно да надградите система си до ново издание на Убунту с този хардуер."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -1098,7 +1102,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1107,11 +1111,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr "Няма достъпен init"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1125,11 +1129,11 @@ msgstr ""
 "изисква се, актуализиране на настройката на виртуалната ви машина.\n"
 "Сигурни ли сте, че искате да продължите?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1146,11 +1150,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1160,11 +1164,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1172,11 +1176,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1185,34 +1189,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr "PAE е изключен"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1220,11 +1224,11 @@ msgid ""
 "http://help.ubuntu.com/community/EnablingPAE"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1236,7 +1240,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/bn.po b/po/bn.po
index e1215aa..2012201 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -12,7 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.7.2\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/bn.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/bn.po
 "PO-Revision-Date: 2019-02-10 12:11+0000\n"
 "Last-Translator: Istiak Ferdous <Unknown>\n"
 "Language-Team: Bengali <[e-mail]>\n"
@@ -984,11 +988,11 @@ msgstr "দয়া করে '%s' ড্রাইভে '%s' প্রবেশ 
 msgid "Media Change"
 msgstr "মিডিয়া পরিবর্তন"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -998,12 +1002,12 @@ msgid ""
 "upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 "আপনার গ্রাফিক্স হার্ডওয়্যার উবুন্টু ১২.০৪ (LTS) এ সম্ভবত পুরোপুরি ভাবে সমর্থন করবে না।"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -1015,7 +1019,7 @@ msgstr ""
 "Bugs/UpdateManagerWarningForI8xx আপনি কি উন্নীতকরণ করতে চান?"
 
 # snigdha
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -1023,7 +1027,7 @@ msgstr ""
 "আপগ্রেড করার ফলে গ্রাফিক ভিত্তিক প্রোগ্রাম ও গেমস্ ব্যবহার করার সময় ডেক্সটপের প্রভাব "
 "ও কার্যকারীতা কিছুটা কমে যাবে।"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -1036,12 +1040,12 @@ msgstr ""
 "\n"
 " আপনি কি চালিয়ে যেতে চান?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -1050,11 +1054,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr "কোনো ARMv6 CPU নেই"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1065,12 +1069,12 @@ msgstr ""
 "সব প্যাকেজ সর্বনিম্ন ARMv6 আর্কিটেকচারে নির্মাণ করা হয়েছে। এই হার্ডওয়্যার সহকারে "
 "আপনার সিস্টেমকে নতুন উবুন্টু সংস্করণে আপগ্রেড করা সম্ভব নয়।"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -1080,7 +1084,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1089,11 +1093,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr "কোনো init নেই"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1108,11 +1112,11 @@ msgstr ""
 "\n"
 "আপনি কি নিশ্চিত আপনি এগিয়ে যেতে চান?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1129,11 +1133,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1143,11 +1147,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1155,11 +1159,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1168,34 +1172,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr "PAE সক্রিয় নয়"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1203,11 +1207,11 @@ msgid ""
 "http://help.ubuntu.com/community/EnablingPAE"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1219,7 +1223,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/bo.po b/po/bo.po
index 4e85d98..976852a 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/bo.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/bo.po
 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
 "Last-Translator: Brian Murray <[e-mail]>\n"
 "Language-Team: Tibetan <[e-mail]>\n"
@@ -919,11 +923,11 @@ msgstr "སྒུལ་ཆས་'%2s'ནང་དུ་'%1s'འཇུག་ར
 msgid "Media Change"
 msgstr "འཇུག་ཟམ་བརྗེ་བ"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -933,11 +937,11 @@ msgid ""
 "upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -945,7 +949,7 @@ msgid ""
 "continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -953,7 +957,7 @@ msgstr ""
 "རིམ་སྤོར་གྱིས་མདུན་ངོས་ཀྱི་རྣམ་པ་དང་རྩེད་རིགས་ཀྱི་འགྲོ་སྟངས། པར་རིས་མང་པོ་ཡོད་པའི་བྱ་རིམ་ལ་འགྱུར་ལྡོག་ཡོད་"
 "ཉེན་ཆེཨ"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -966,12 +970,12 @@ msgstr ""
 "\n"
 "ཁྱོད་ཀྱིས་མུ་མཐུད་དགོས་སམ"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -980,11 +984,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr "ARMv6 CPU་མེད་པ"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -996,12 +1000,12 @@ msgstr ""
 "minimal architecture. It is not possible to upgrade your system to a new "
 "Ubuntu release with this hardware."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -1011,7 +1015,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1020,11 +1024,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr "init ་མེད་པ"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1040,11 +1044,11 @@ msgstr ""
 "\n"
 "Are you sure you want to continue?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1061,11 +1065,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1075,11 +1079,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1087,11 +1091,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1100,34 +1104,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1135,11 +1139,11 @@ msgid ""
 "http://help.ubuntu.com/community/EnablingPAE"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1151,7 +1155,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/br.po b/po/br.po
index c616b5e..d87936b 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/br.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/br.po
 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
 "Last-Translator: Brian Murray <[e-mail]>\n"
 "Language-Team: Breton <[e-mail]>\n"
@@ -940,11 +944,11 @@ msgstr "Mar plij, enlakait '%s' el lenner '%s'"
 msgid "Media Change"
 msgstr "Kemm ar media"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -954,11 +958,11 @@ msgid ""
 "upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -966,7 +970,7 @@ msgid ""
 "continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -974,7 +978,7 @@ msgstr ""
 "Dre an hizivaat e vo gwashaet efedoù ar burev marteze, an digonadoù evit ar "
 "c'hoarioù hag ar gouvlevioù a c'houlenn kalz a-fet kevregadoù."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -988,12 +992,12 @@ msgstr ""
 "\n"
 "Ha fellout a ra deoc'h kenderc'hel ?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -1002,11 +1006,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr "Korrgewerier ARMv6 ebet"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1018,12 +1022,12 @@ msgstr ""
 "c'houlenne da gaout ARMv6 evit adeiladezh izek. N'eus ket tro da hizivaat ho "
 "reizhiad da handelv nevez Ubuntu gant ar periant-mañ."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -1033,7 +1037,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1042,12 +1046,12 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr "an deraouekaat n'eo ket hegerz"
 
 # daemon : argerzh en drekva
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1062,11 +1066,11 @@ msgstr ""
 "gefluniañ galloudel da gentañ.\n"
 "Ha fellout a ra deoc'h kenderc'hel ?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1083,11 +1087,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1097,11 +1101,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1109,11 +1113,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1122,34 +1126,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1157,11 +1161,11 @@ msgid ""
 "http://help.ubuntu.com/community/EnablingPAE"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1173,7 +1177,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/bs.po b/po/bs.po
index 905513c..96d7d64 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/bs.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/bs.po
 "PO-Revision-Date: 2019-06-18 17:53+0000\n"
 "Last-Translator: Brian Murray <[e-mail]>\n"
 "Language-Team: Bosnian <[e-mail]>\n"
@@ -1027,13 +1031,13 @@ msgstr "Molim, ubacite '%s' u uređaj '%s'"
 msgid "Media Change"
 msgstr "Izmjena Medija"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 "Postoji mogućnost da vaš grafički hardver ne bude u potpunosti podržan na "
 "Ubuntu 14.04."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -1047,11 +1051,11 @@ msgstr ""
 "sačuvate LTS verziju. Za više informacija pogledajte https://wiki.ubuntu.com/"
 "X/Bugs/UpdateManagerWarningForUnity3D Želite li nastaviti s nadogradnjom?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr "Vaš grafički hardver možda nije potpuno podržan u Ubuntu 12.04 LTS."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -1063,7 +1067,7 @@ msgstr ""
 "wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Želite li nastaviti sa "
 "nadogradnjom?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -1071,7 +1075,7 @@ msgstr ""
 "Nadogradnja može reducirati desktop efekte i učinak u igrama i drugim "
 "grafički zahtjevnim programima."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -1084,12 +1088,12 @@ msgstr ""
 "\n"
 "Da li želite da nastavite?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -1098,11 +1102,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr "Nema ARMv6 procesora"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1114,12 +1118,12 @@ msgstr ""
 "minimalnu arhitekturu. Nije moguće nadograditi vaš sistem na novo Ubuntu "
 "izdanje sa ovim hardverom."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -1129,7 +1133,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1138,11 +1142,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr "init nije dostupan"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1157,11 +1161,11 @@ msgstr ""
 "\n"
 "Da li ste sigurni da želite na nastavite?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1178,11 +1182,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1192,11 +1196,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1204,11 +1208,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1217,34 +1221,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr "PAE nije uključen"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1256,11 +1260,11 @@ msgstr ""
 "omogućiti PAE (ako je to moguće) vidi:\n"
 "http://help.ubuntu.com/community/EnablingPAE"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1272,7 +1276,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 5f88810..cc53a26 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/ca.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/ca.po
 "PO-Revision-Date: 2019-06-18 17:52+0000\n"
 "Last-Translator: Walter Garcia-Fontes <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
@@ -1038,12 +1042,12 @@ msgstr "Inseriu «%s» a la unitat «%s»"
 msgid "Media Change"
 msgstr "Canvi de suport"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 "Pot ser que el vostre maquinari de gràfics no funcioni bé amb l'Ubuntu 14.04."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -1059,13 +1063,13 @@ msgstr ""
 "UpdateManagerWarningForUnity3D. Tot i això, voleu continuar amb "
 "l'actualització?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 "Sembla que el vostre maquinari gràfic no és totalment compatible amb "
 "l'Ubuntu 12.04 LTS."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -1077,7 +1081,7 @@ msgstr ""
 "informació visiteu https://wiki.ubuntu.com/X/Bugs/"
 "UpdateManagerWarningForI8xx. Voleu continuar amb l'actualització?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -1085,7 +1089,7 @@ msgstr ""
 "L'actualització pot reduir els efectes d'escriptori i el rendiment en jocs i "
 "altres programes que facin un ús exhaustiu de processament gràfic."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -1099,12 +1103,12 @@ msgstr ""
 "\n"
 "Voleu continuar?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -1113,11 +1117,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr "No és una CPU ARMv6"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1129,12 +1133,12 @@ msgstr ""
 "requereixen l'ARMv6 com a arquitectura mínima. No és possible actualitzar el "
 "vostre sistema a una versió nova de l'Ubuntu amb aquest maquinari."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -1144,7 +1148,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1153,11 +1157,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr "No hi ha cap sistema d'inicialització disponible"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1173,11 +1177,11 @@ msgstr ""
 "\n"
 "Esteu segur que voleu continuar?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1194,12 +1198,12 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 #, fuzzy
 msgid "Connection to the Snap Store failed"
 msgstr "Ha fallat la connexió a la Botiga Snap"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1209,11 +1213,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr "Ha fallat la connexió a la Botiga Snap"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1225,11 +1229,11 @@ msgstr ""
 "a api.snapcraft.io.\n"
 "Encara voleu continuar amb l'actualització?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr "Paquet snapd desactualitzat"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1242,34 +1246,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr "El PAE no està habilitat"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1282,11 +1286,11 @@ msgstr ""
 "Consulteu la documentació següent per obtenir més informació:\n"
 "http://help.ubuntu.com/community/EnablingPAE"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1298,7 +1302,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr "S'està comprovant si hi ha snaps instal·lats"
 
diff --git a/po/[e-mail] b/po/[e-mail]
index 4950923..a027d9b 100644
--- a/po/[e-mail]
+++ b/po/[e-mail]
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/[e-mail]
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/[e-mail]
 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
 "Last-Translator: Joan Duran <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
@@ -969,12 +973,12 @@ msgstr "Inseriu «%s» a la unitat «%s»"
 msgid "Media Change"
 msgstr "Canvi de suport"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 "Pot ser que el vostre maquinari de gràfics no funcione bé amb l'Ubuntu 14.04."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -984,11 +988,11 @@ msgid ""
 "upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -996,7 +1000,7 @@ msgid ""
 "continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -1004,7 +1008,7 @@ msgstr ""
 "L'actualització pot reduir els efectes d'escriptori i el rendiment en jocs i "
 "altres programes que facen un ús exhaustiu de processament gràfic."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -1018,12 +1022,12 @@ msgstr ""
 "\n"
 "Voleu continuar?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -1032,11 +1036,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr "No és una CPU ARMv6"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1048,12 +1052,12 @@ msgstr ""
 "requereixen l'ARMv6 com a arquitectura mínima. No és possible actualitzar el "
 "vostre sistema a una versió nova de l'Ubuntu amb este maquinari."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -1063,7 +1067,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1072,11 +1076,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr "No hi ha cap sistema d'inicialització disponible"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1092,11 +1096,11 @@ msgstr ""
 "\n"
 "Segur que voleu continuar?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1113,11 +1117,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1127,11 +1131,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1139,11 +1143,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1152,34 +1156,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr "El PAE no està habilitat"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1192,11 +1196,11 @@ msgstr ""
 "Consulteu la documentació següent per obtindre més informació:\n"
 "http://help.ubuntu.com/community/EnablingPAE"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1208,7 +1212,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/ce.po b/po/ce.po
index 05704af..a48dd1b 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ubuntu-release-upgrader\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/ce.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/ce.po
 "PO-Revision-Date: 2014-08-21 06:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chechen <[e-mail]>\n"
@@ -917,11 +921,11 @@ msgstr ""
 msgid "Media Change"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -931,11 +935,11 @@ msgid ""
 "upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -943,13 +947,13 @@ msgid ""
 "continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -958,12 +962,12 @@ msgid ""
 "Do you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -972,11 +976,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -984,12 +988,12 @@ msgid ""
 "Ubuntu release with this hardware."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -999,7 +1003,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -1008,11 +1012,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1022,11 +1026,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1043,11 +1047,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1057,11 +1061,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1069,11 +1073,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1082,34 +1086,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1117,11 +1121,11 @@ msgid ""
 "http://help.ubuntu.com/community/EnablingPAE"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1133,7 +1137,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/ceb.po b/po/ceb.po
index 81ae5fb..59862b8 100644
--- a/po/ceb.po
+++ b/po/ceb.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/ceb.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/ceb.po
 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
 "Last-Translator: James Banogon <[e-mail]>\n"
 "Language-Team: Cebuano <[e-mail]>\n"
@@ -878,11 +882,11 @@ msgstr ""
 msgid "Media Change"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -892,11 +896,11 @@ msgid ""
 "upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -904,13 +908,13 @@ msgid ""
 "continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -919,12 +923,12 @@ msgid ""
 "Do you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -933,11 +937,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -945,12 +949,12 @@ msgid ""
 "Ubuntu release with this hardware."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -960,7 +964,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -969,11 +973,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -983,11 +987,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1004,11 +1008,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1018,11 +1022,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1030,11 +1034,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1043,34 +1047,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1078,11 +1082,11 @@ msgid ""
 "http://help.ubuntu.com/community/EnablingPAE"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1094,7 +1098,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/ckb.po b/po/ckb.po
index 0cec478..6a4285d 100644
--- a/po/ckb.po
+++ b/po/ckb.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/ckb.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/ckb.po
 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
 "Last-Translator: jwtear nariman <[e-mail]>\n"
 "Language-Team: Kurdish (Sorani) <[e-mail]>\n"
@@ -883,11 +887,11 @@ msgstr ""
 msgid "Media Change"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -897,11 +901,11 @@ msgid ""
 "upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -909,13 +913,13 @@ msgid ""
 "continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -924,12 +928,12 @@ msgid ""
 "Do you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "
@@ -938,11 +942,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:342
+#: ../DistUpgrade/DistUpgradeQuirks.py:343
 msgid "No ARMv6 CPU"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:343
+#: ../DistUpgrade/DistUpgradeQuirks.py:344
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -950,12 +954,12 @@ msgid ""
 "Ubuntu release with this hardware."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:363
+#: ../DistUpgrade/DistUpgradeQuirks.py:364
 msgid ""
 "Sorry, this storage driver is not supported in kernels for newer releases"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:365
+#: ../DistUpgrade/DistUpgradeQuirks.py:366
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases that provide kernel support "
@@ -965,7 +969,7 @@ msgid ""
 "driver, remove the directory %s and try again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:396
+#: ../DistUpgrade/DistUpgradeQuirks.py:397
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's POWER8 "
@@ -974,11 +978,11 @@ msgid ""
 "Updates for Ubuntu %s will continue until %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:414
+#: ../DistUpgrade/DistUpgradeQuirks.py:415
 msgid "No init available"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:415
+#: ../DistUpgrade/DistUpgradeQuirks.py:416
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -988,11 +992,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:456
+#: ../DistUpgrade/DistUpgradeQuirks.py:457
 msgid "The Robot Operating System (ROS) is installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:457
+#: ../DistUpgrade/DistUpgradeQuirks.py:458
 msgid ""
 "It appears that ROS is currently installed. Each ROS release is very strict "
 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
@@ -1009,11 +1013,11 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:582
+#: ../DistUpgrade/DistUpgradeQuirks.py:583
 msgid "Connection to the Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:583
+#: ../DistUpgrade/DistUpgradeQuirks.py:584
 msgid ""
 "You have the package lxd installed but your system is unable to reach the "
 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
@@ -1023,11 +1027,11 @@ msgid ""
 "may want to configure a Snap Store proxy."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:598
+#: ../DistUpgrade/DistUpgradeQuirks.py:599
 msgid "Connection to Snap Store failed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:599
+#: ../DistUpgrade/DistUpgradeQuirks.py:600
 msgid ""
 "Your system does not have a connection to the Snap Store. For the best "
 "upgrade experience make sure that your system can connect to api.snapcraft."
@@ -1035,11 +1039,11 @@ msgid ""
 "Do you still want to continue with the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:608
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
 msgid "Outdated snapd package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:609
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
 msgid ""
 "Your system does not have the latest version of snapd. Please update the "
 "version of snapd on your system to improve the upgrade experience.\n"
@@ -1048,34 +1052,34 @@ msgstr ""
 
 #. now perform direct API calls to the store, requesting size
 #. information for each of the snaps needing installation
-#: ../DistUpgrade/DistUpgradeQuirks.py:634
+#: ../DistUpgrade/DistUpgradeQuirks.py:635
 msgid "Calculating snap size requirements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:665
+#: ../DistUpgrade/DistUpgradeQuirks.py:666
 msgid "Processing snap replacements"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:671
+#: ../DistUpgrade/DistUpgradeQuirks.py:672
 #, python-format
 msgid "refreshing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:675
+#: ../DistUpgrade/DistUpgradeQuirks.py:676
 #, python-format
 msgid "removing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:679
 #, python-format
 msgid "installing snap %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:707
+#: ../DistUpgrade/DistUpgradeQuirks.py:708
 msgid "PAE not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:708
+#: ../DistUpgrade/DistUpgradeQuirks.py:709
 msgid ""
 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1083,11 +1087,11 @@ msgid ""
 "http://help.ubuntu.com/community/EnablingPAE"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
 msgid "universe component not enabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
 #, python-format
 msgid ""
 "You have the package %s installed which is a python2 package. python2 has "
@@ -1099,7 +1103,7 @@ msgid ""
 "universe component in /etc/apt/sources.list or remove %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
 msgid "Checking for installed snaps"
 msgstr ""
 
diff --git a/po/crh.po b/po/crh.po
index 1ce6c5e..45f6996 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< po/crh.po
 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
+=======
+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
+>>>>>>> po/crh.po
 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
 "Last-Translator: Reşat SABIQ <[e-mail]>\n"
 "Language-Team: QIRIMTATARCA (Qırım Türkçesi) <tilde-birlik-tercime@lists."
@@ -1008,11 +1012,11 @@ msgstr "Lütfen \"%2s\" sürücüsüne \"%1s\" takın"
 msgid "Media Change"
 msgstr "Vasat Deñişimi"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:235
+#: ../DistUpgrade/DistUpgradeQuirks.py:236
 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:237
+#: ../DistUpgrade/DistUpgradeQuirks.py:238
 msgid ""
 "Running the 'unity' desktop environment is not fully supported by your "
 "graphics hardware. You will maybe end up in a very slow environment after "
@@ -1022,11 +1026,11 @@ msgid ""
 "upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:261
+#: ../DistUpgrade/DistUpgradeQuirks.py:262
 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:263
+#: ../DistUpgrade/DistUpgradeQuirks.py:264
 msgid ""
 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
 "and you may encounter problems after the upgrade. For more information see "
@@ -1035,7 +1039,7 @@ msgid ""
 msgstr ""
 
 # tr
-#: ../DistUpgrade/DistUpgradeQuirks.py:283
+#: ../DistUpgrade/DistUpgradeQuirks.py:284
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -1044,7 +1048,7 @@ msgstr ""
 "uygulamaların başarımını düşürebilir."
 
 # tr
-#: ../DistUpgrade/DistUpgradeQuirks.py:287
+#: ../DistUpgrade/DistUpgradeQuirks.py:288
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -1057,12 +1061,12 @@ msgstr ""
 "\n"
 "Devam etmege isteysiñizmi?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:326
-#: ../DistUpgrade/DistUpgradeQuirks.py:395
+#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:396
 msgid "Sorry, no more upgrades for this system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:327
+#: ../DistUpgrade/DistUpgradeQuirks.py:328
 #, python-format
 msgid ""
 "There will not be any further Ubuntu releases for this system's 'i386' "