Release Upgrader

Merge ubuntu-release-upgrader:nvidia-quirk-abort into ubuntu-release-upgrader:ubuntu/main

  1. Git
  2. lp:ubuntu-release-upgrader
  3. nvidia-quirk-abort
  4. Merge into ubuntu/main
Proposed by Brian Murray
Status: Superseded
Proposed branch: ubuntu-release-upgrader:nvidia-quirk-abort
Merge into: ubuntu-release-upgrader:ubuntu/main
Diff against target: 33176 lines (+6079/-4296) (has conflicts)
141 files modified
DistUpgrade/DistUpgradeQuirks.py (+109/-0)
DistUpgrade/DistUpgradeVersion.py (+4/-0)
data/DistUpgrade.cfg.groovy (+131/-0)
data/DistUpgrade.cfg.hirsute (+131/-0)
data/demoted.cfg.groovy (+1/-0)
data/demoted.cfg.hirsute (+1/-0)
data/mirrors.cfg (+40/-8)
debian/changelog (+39/-0)
debian/control (+1/-0)
debian/tests/control (+1/-1)
po/af.po (+38/-34)
po/am.po (+38/-34)
po/an.po (+38/-34)
po/ar.po (+38/-34)
po/ast.po (+38/-34)
po/az.po (+38/-34)
po/be.po (+38/-34)
po/bg.po (+38/-34)
po/bn.po (+38/-34)
po/bo.po (+38/-34)
po/br.po (+38/-34)
po/bs.po (+38/-34)
po/ca.po (+38/-34)
po/ca@valencia.po (+38/-34)
po/ce.po (+38/-34)
po/ceb.po (+38/-34)
po/ckb.po (+38/-34)
po/crh.po (+38/-34)
po/cs.po (+38/-34)
po/csb.po (+38/-34)
po/cv.po (+38/-34)
po/cy.po (+38/-34)
po/da.po (+38/-34)
po/de.po (+38/-34)
po/dv.po (+38/-34)
po/el.po (+38/-34)
po/en_AU.po (+38/-34)
po/en_CA.po (+38/-34)
po/en_GB.po (+38/-34)
po/eo.po (+38/-34)
po/es.po (+38/-34)
po/et.po (+38/-34)
po/eu.po (+38/-34)
po/fa.po (+38/-34)
po/fi.po (+38/-34)
po/fil.po (+38/-34)
po/fo.po (+38/-34)
po/fr.po (+38/-34)
po/fr_CA.po (+38/-34)
po/fur.po (+38/-34)
po/fy.po (+38/-34)
po/ga.po (+38/-34)
po/gd.po (+38/-34)
po/gl.po (+38/-34)
po/gu.po (+38/-34)
po/gv.po (+38/-34)
po/he.po (+38/-34)
po/hi.po (+38/-34)
po/hr.po (+38/-34)
po/hu.po (+38/-34)
po/hy.po (+38/-34)
po/ia.po (+38/-34)
po/id.po (+38/-34)
po/is.po (+38/-34)
po/it.po (+38/-34)
po/ja.po (+38/-34)
po/jv.po (+38/-34)
po/ka.po (+38/-34)
po/kk.po (+38/-34)
po/km.po (+38/-34)
po/kn.po (+38/-34)
po/ko.po (+38/-34)
po/ku.po (+38/-34)
po/ky.po (+38/-34)
po/lb.po (+38/-34)
po/ln.po (+38/-34)
po/lo.po (+38/-34)
po/lt.po (+38/-34)
po/lv.po (+38/-34)
po/mhr.po (+38/-34)
po/mjw.po (+38/-34)
po/mk.po (+38/-34)
po/ml.po (+38/-34)
po/mn.po (+38/-34)
po/mnw.po (+38/-34)
po/mr.po (+38/-34)
po/ms.po (+38/-34)
po/mus.po (+38/-34)
po/my.po (+38/-34)
po/nb.po (+38/-34)
po/nds.po (+38/-34)
po/ne.po (+38/-34)
po/nl.po (+38/-34)
po/nn.po (+38/-34)
po/oc.po (+38/-34)
po/om.po (+38/-34)
po/pa.po (+38/-34)
po/pam.po (+38/-34)
po/pl.po (+38/-34)
po/ps.po (+38/-34)
po/pt.po (+38/-34)
po/pt_BR.po (+38/-34)
po/qu.po (+38/-34)
po/ro.po (+38/-34)
po/ru.po (+38/-34)
po/rw.po (+38/-34)
po/sc.po (+38/-34)
po/sco.po (+38/-34)
po/sd.po (+38/-34)
po/se.po (+38/-34)
po/shn.po (+38/-34)
po/si.po (+38/-34)
po/sk.po (+38/-34)
po/sl.po (+38/-34)
po/sq.po (+38/-34)
po/sr.po (+38/-34)
po/sv.po (+38/-34)
po/szl.po (+38/-34)
po/ta.po (+38/-34)
po/ta_LK.po (+38/-34)
po/te.po (+38/-34)
po/tg.po (+38/-34)
po/th.po (+38/-34)
po/tl.po (+38/-34)
po/tr.po (+38/-34)
po/ubuntu-release-upgrader.pot (+38/-34)
po/ug.po (+38/-34)
po/uk.po (+38/-34)
po/ur.po (+38/-34)
po/uz.po (+38/-34)
po/vi.po (+38/-34)
po/xh.po (+38/-34)
po/zh_CN.po (+38/-34)
po/zh_HK.po (+38/-34)
po/zh_TW.po (+38/-34)
po/zu.po (+38/-34)
pre-build.sh (+6/-1)
tests/test_quirks.py (+242/-0)
utils/demoted.cfg.focal (+0/-2)
utils/demoted.cfg.groovy (+311/-0)
utils/demoted.cfg.hirsute (+274/-0)
Conflict in DistUpgrade/DistUpgradeVersion.py
Conflict in data/mirrors.cfg
Conflict in debian/changelog
Conflict in po/af.po
Conflict in po/am.po
Conflict in po/an.po
Conflict in po/ar.po
Conflict in po/ast.po
Conflict in po/az.po
Conflict in po/be.po
Conflict in po/bg.po
Conflict in po/bn.po
Conflict in po/bo.po
Conflict in po/br.po
Conflict in po/bs.po
Conflict in po/ca.po
Conflict in po/ca@valencia.po
Conflict in po/ce.po
Conflict in po/ceb.po
Conflict in po/ckb.po
Conflict in po/crh.po
Conflict in po/cs.po
Conflict in po/csb.po
Conflict in po/cv.po
Conflict in po/cy.po
Conflict in po/da.po
Conflict in po/de.po
Conflict in po/dv.po
Conflict in po/el.po
Conflict in po/en_AU.po
Conflict in po/en_CA.po
Conflict in po/en_GB.po
Conflict in po/eo.po
Conflict in po/es.po
Conflict in po/et.po
Conflict in po/eu.po
Conflict in po/fa.po
Conflict in po/fi.po
Conflict in po/fil.po
Conflict in po/fo.po
Conflict in po/fr.po
Conflict in po/fr_CA.po
Conflict in po/fur.po
Conflict in po/fy.po
Conflict in po/ga.po
Conflict in po/gd.po
Conflict in po/gl.po
Conflict in po/gu.po
Conflict in po/gv.po
Conflict in po/he.po
Conflict in po/hi.po
Conflict in po/hr.po
Conflict in po/hu.po
Conflict in po/hy.po
Conflict in po/ia.po
Conflict in po/id.po
Conflict in po/is.po
Conflict in po/it.po
Conflict in po/ja.po
Conflict in po/jv.po
Conflict in po/ka.po
Conflict in po/kk.po
Conflict in po/km.po
Conflict in po/kn.po
Conflict in po/ko.po
Conflict in po/ku.po
Conflict in po/ky.po
Conflict in po/lb.po
Conflict in po/ln.po
Conflict in po/lo.po
Conflict in po/lt.po
Conflict in po/lv.po
Conflict in po/mhr.po
Conflict in po/mjw.po
Conflict in po/mk.po
Conflict in po/ml.po
Conflict in po/mn.po
Conflict in po/mnw.po
Conflict in po/mr.po
Conflict in po/ms.po
Conflict in po/mus.po
Conflict in po/my.po
Conflict in po/nb.po
Conflict in po/nds.po
Conflict in po/ne.po
Conflict in po/nl.po
Conflict in po/nn.po
Conflict in po/oc.po
Conflict in po/om.po
Conflict in po/pa.po
Conflict in po/pam.po
Conflict in po/pl.po
Conflict in po/ps.po
Conflict in po/pt.po
Conflict in po/pt_BR.po
Conflict in po/qu.po
Conflict in po/ro.po
Conflict in po/ru.po
Conflict in po/rw.po
Conflict in po/sc.po
Conflict in po/sco.po
Conflict in po/sd.po
Conflict in po/se.po
Conflict in po/shn.po
Conflict in po/si.po
Conflict in po/sk.po
Conflict in po/sl.po
Conflict in po/sq.po
Conflict in po/sr.po
Conflict in po/sv.po
Conflict in po/szl.po
Conflict in po/ta.po
Conflict in po/ta_LK.po
Conflict in po/te.po
Conflict in po/tg.po
Conflict in po/th.po
Conflict in po/tl.po
Conflict in po/tr.po
Conflict in po/ubuntu-release-upgrader.pot
Conflict in po/ug.po
Conflict in po/uk.po
Conflict in po/ur.po
Conflict in po/uz.po
Conflict in po/vi.po
Conflict in po/xh.po
Conflict in po/zh_CN.po
Conflict in po/zh_HK.po
Conflict in po/zh_TW.po
Conflict in po/zu.po
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+427735@code.launchpad.net

This proposal has been superseded by a proposal from 2022-08-02.

Description of the change

This builds upon the work in https://code.launchpad.net/~schopin/ubuntu-release-upgrader/+git/ubuntu-release-upgrader/+merge/427718 but exits the release upgrade process if the nvidia driver metapackage can not be installed.

To post a comment you must log in.

Unmerged commits

c58ed3c... by Brian Murray

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

c3cc804... by Brian Murray

Fix a typo

9a45503... by Simon Chopin

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

releasing package ubuntu-release-upgrader version 1:22.04.12

b0ad9f0... by Brian Murray

tests/test_quirks.py: Remove declaration of unused variables

4197ea9... by Brian Murray

Update TestSnapQuirks for a more modern release

6ba1033... by Brian Murray

Fix a flake8 check

1bf9ea4... by Brian Murray

DistUpgrade/deb2snap.json: gnome-3-34-1804 is no longer a seeded snap and should not be refreshed. (LP: #1981485)

880e39b... by Brian Murray

Add a changelog entry for WSL reboot.

39e898b... by Edu Gómez Escandell

Prevented WSL from restarting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
2index 034cc77..b32889b 100644
3--- a/DistUpgrade/DistUpgradeQuirks.py
4+++ b/DistUpgrade/DistUpgradeQuirks.py
5@@ -122,6 +122,7 @@ class DistUpgradeQuirks(object):
6
7 cache = self.controller.cache
8 self._test_and_warn_if_ros_installed(cache)
9+ self._fix_missing_nvidia_metapackage()
10
11 if 'snapd' not in cache:
12 logging.debug("package required for Quirk not in cache")
13@@ -151,6 +152,7 @@ class DistUpgradeQuirks(object):
14 if 'linux-firmware-raspi2' in cache:
15 if cache['linux-firmware-raspi2'].is_installed:
16 self._remove_uboot_on_rpi()
17+ self._remove_netplan_match_rpi()
18
19 # individual quirks handler when the dpkg run is finished ---------
20 def PostCleanup(self):
21@@ -1377,3 +1379,110 @@ class DistUpgradeQuirks(object):
22 except IOError as exc:
23 logging.error("unable to write new boot config to %s: %s; %s",
24 boot_config_filename, exc, failure_action)
25+
26+ def _remove_netplan_match_rpi(self, netplan_dir='/etc/netplan'):
27+ failure_action = (
28+ "You may need to manually edit your netplan config "
29+ "and remove the line \"driver: bcmgenet smsc95xx lan78xx\". "
30+ "See LP: #1970761 for further details")
31+
32+ try:
33+ import yaml
34+ except ImportError:
35+ logging.error("failed to import yaml library. %s", failure_action)
36+ return
37+
38+ for netplan_config_file in glob.glob("%s/*.yaml" % netplan_dir):
39+ try:
40+ netplan_config_filename = os.path.join(netplan_dir,
41+ netplan_config_file)
42+ with open(netplan_config_filename, 'r', encoding='utf-8') as f:
43+ orig_content = f.read()
44+ netplan_yaml = yaml.load(orig_content,
45+ Loader=yaml.SafeLoader)
46+
47+ except FileNotFoundError:
48+ logging.error("failed to open netplan configuration in %s; %s",
49+ netplan_config_filename, failure_action)
50+ return
51+
52+ file_modified = False
53+ try:
54+ for eth in netplan_yaml["network"]["ethernets"].values():
55+ if eth["match"]["driver"] == "bcmgenet smsc95xx lan78xx":
56+ file_modified = True
57+ del eth["match"]
58+ if "set-name" in eth:
59+ del eth["set-name"]
60+ except KeyError:
61+ continue
62+
63+ if not file_modified:
64+ continue
65+
66+ try:
67+ netplan_backup_filename = (netplan_config_filename +
68+ '.distUpgrade')
69+ with open(netplan_backup_filename, 'w', encoding='utf-8') as f:
70+ f.write(orig_content)
71+ except IOError as exc:
72+ logging.error("unable to write netplan config backup to "
73+ "%s: %s; %s",
74+ netplan_backup_filename, exc, failure_action)
75+ return
76+ try:
77+ with open(netplan_config_filename, 'w', encoding='utf-8') as f:
78+ yaml.dump(netplan_yaml, f, default_flow_style=False)
79+ except IOError as exc:
80+ logging.error("unable to write new netplan config to "
81+ "%s: %s; %s",
82+ netplan_config_filename, exc, failure_action)
83+ return
84+
85+ def _fix_missing_nvidia_metapackage(self):
86+ # LP: #1955047
87+ # Desktop installs for 20.04.3 on systems with nvidia graphics don't have the
88+ # driver metapackage installed
89+ logging.debug("running Quirks._test_and_fix_missing_nvidia_metapackage")
90+ try:
91+ from NvidiaDetector.nvidiadetector import NvidiaDetection
92+ except (ImportError) as e:
93+ logging.error("NvidiaDetection can not be imported %s" % e)
94+ return
95+ nv = NvidiaDetection()
96+ versions = nv.drivers.keys()
97+ cache = self.controller.cache
98+ # Early exit if there's a driver metapackage installed
99+ for version in versions:
100+ desktop = 'nvidia-driver-{}'.format(version)
101+ if desktop in cache and cache[desktop].is_installed:
102+ logging.debug("package {} detected, exit.".format(desktop))
103+ return
104+ version_to_fix = None
105+ # If we find an autoremovable libnvidia-gl package, this probably means the user
106+ # hit LP: #1955047
107+ for version in versions:
108+ nvidia_gl = 'libnvidia-gl-{}'.format(version)
109+ if nvidia_gl in cache and cache[nvidia_gl].is_installed and cache[nvidia_gl].is_auto_removable:
110+ version_to_fix = version
111+ logging.debug("Found autoremovable package {}, assuming we're missing nvidia-driver-{}".format(nvidia_gl, version))
112+ break
113+ if version_to_fix is None:
114+ logging.debug("No autoremovable libnvidia-gl found, exiting.")
115+ return
116+ missing_metapackage = "nvidia-driver-{}".format(version_to_fix)
117+ if missing_metapackage not in cache:
118+ logging.error("Package {} not available in the APT cache!".format(missing_metapackage))
119+ summary = _("NVIDIA driver metapackage unavailable")
120+ msg = _("Your system has the package libnvidia-gl-%s installed "
121+ "but the corresponding metapackage nvidia-driver-%s is "
122+ "not installed and is not available to be installed. "
123+ "The upgrade process was not able to automatically fix "
124+ "this issue and subsequently the upgrade will now exit." %
125+ (version, version))
126+ self._view.error(summary, msg)
127+ self.controller.abort()
128+ return
129+ logging.debug("Installing missing nvidia driver metapackage {}".format(missing_metapackage))
130+ cache[missing_metapackage].mark_install()
131+ cache.commit(None, None)
132diff --git a/DistUpgrade/DistUpgradeVersion.py b/DistUpgrade/DistUpgradeVersion.py
133index be51958..1c25d45 100644
134--- a/DistUpgrade/DistUpgradeVersion.py
135+++ b/DistUpgrade/DistUpgradeVersion.py
136@@ -1 +1,5 @@
137+<<<<<<< DistUpgrade/DistUpgradeVersion.py
138 VERSION = '22.10.6'
139+=======
140+VERSION = '22.04.12'
141+>>>>>>> DistUpgrade/DistUpgradeVersion.py
142diff --git a/data/DistUpgrade.cfg.groovy b/data/DistUpgrade.cfg.groovy
143new file mode 100644
144index 0000000..cb53d63
145--- /dev/null
146+++ b/data/DistUpgrade.cfg.groovy
147@@ -0,0 +1,131 @@
148+[View]
149+# the views will be tried in this order, if one fails to import, the next
150+# is tried
151+View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
152+#View=DistUpgradeViewNonInteractive
153+#Depends= apt (>= 1.0.10.2ubuntu2)
154+# the views below support upgrades over ssh connection
155+SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
156+
157+# Distro contains global information about the upgrade
158+[Distro]
159+# the meta-pkgs we support
160+MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-core,
161+ xubuntu-desktop, ubuntustudio-desktop, mythbuntu-desktop,
162+ kubuntu-netbook, lubuntu-desktop, ubuntu-gnome-desktop,
163+ ubuntu-mate-core, ubuntu-mate-desktop,
164+ ubuntukylin-desktop, ubuntu-budgie-desktop
165+BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
166+# minimal & standard, are handed via BaseMetaPkgs rule
167+# ubuntu-core is left-over task we forgot to remove
168+IgnoredTasks=minimal, standard, ubuntu-core
169+Demotions=demoted.cfg.groovy
170+#RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
171+RemovalDenylistFile=removal_denylist.cfg
172+# if those packages were installed, make sure to keep them installed
173+KeepInstalledPkgs=xserver-xorg-video-all
174+KeepInstalledSection=translations
175+RemoveObsoletes=yes
176+PurgeObsoletes=yes
177+#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
178+# hints for for stuff that should be done right after the cache calculated
179+# the dist-upgrade (not to be confused with the PostUpgrade hooks in the
180+# quirks handling)
181+#PostUpgradePurge=linux-restricted-modules-common
182+#PostUpgradeRemove=xsettings-kde
183+#PostUpgradeUpgrade=brasero,edubuntu-desktop
184+#PostUpgradeInstall=apt
185+PostInstallScripts=./xorg_fix_proprietary.py
186+EnableApport=yes
187+# this supported deny listing certain versions to ensure we do not upgrade
188+# - blcr-dkms fails to build on kernel 2.6.35
189+#BadVersions=blcr-dkms_0.8.2-13
190+# ubiquity slideshow
191+#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
192+
193+# information about the individual meta-pkgs
194+[ubuntu-desktop]
195+KeyDependencies=lightdm, unity, ubuntu-artwork, ubuntu-sounds
196+# those pkgs will be marked remove right after the distUpgrade in the cache
197+PostUpgradeRemove=gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
198+ForcedObsoletes=desktop-effects, gnome-app-install, policykit-gnome, gnome-mount
199+
200+[kubuntu-desktop]
201+KeyDependencies=plasma-desktop, kubuntu-settings-desktop
202+PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager, kmix
203+# those packages are marked as obsolete right after the upgrade
204+ForcedObsoletes=ivman, gtk-qt-engine
205+# help the resolver a bit: LP: #1426132
206+PostUpgradeInstall=baloo-kf5
207+
208+[kubuntu-netbook]
209+KeyDependencies=plasma-netbook, kubuntu-settings-netbook
210+
211+[ubuntu-netbook]
212+KeyDependencies=gdm, ubuntu-netbook-default-settings
213+
214+[xubuntu-core]
215+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
216+PostUpgradeRemove=notification-daemon
217+
218+[xubuntu-desktop]
219+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
220+PostUpgradeRemove=notification-daemon
221+
222+[ubuntustudio-desktop]
223+KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look
224+
225+[ichthux-desktop]
226+KeyDependencies=ichthux-artwork, ichthux-default-settings
227+
228+[mythbuntu-desktop]
229+KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings
230+
231+[lubuntu-desktop]
232+KeyDependencies=lubuntu-artwork, lubuntu-default-settings
233+
234+[ubuntu-gnome-desktop]
235+KeyDependencies=ubuntu-gnome-default-settings, ubuntu-gnome-wallpapers
236+
237+[ubuntu-mate-core]
238+KeyDependencies=mate-desktop-environment-core, ubuntu-mate-default-settings, marco
239+PostUpgradeRemove=ibus,lightdm-gtk-greeter,lightdm-gtk-greeter-settings
240+
241+[ubuntu-mate-desktop]
242+KeyDependencies=ubuntu-mate-core, deja-dup-caja
243+PostUpgradeRemove=ibus,lightdm-gtk-greeter,lightdm-gtk-greeter-settings
244+
245+[ubuntukylin-desktop]
246+KeyDependencies=ubuntukylin-keyring, ubuntukylin-wallpapers, ubuntu-kylin-docs
247+
248+[ubuntu-budgie-desktop]
249+KeyDependencies=budgie-desktop-environment, budgie-welcome, ubuntu-budgie-themes
250+
251+[Files]
252+BackupExt=distUpgrade
253+LogDir=/var/log/dist-upgrade/
254+
255+[Sources]
256+From=groovy
257+To=jammy
258+ValidOrigin=Ubuntu
259+ValidMirrors = mirrors.cfg
260+Components=main,restricted,universe,multiverse
261+Pockets=security,updates,proposed,backports
262+;AllowThirdParty=False
263+
264+;[PreRequists]
265+;Packages=release-upgrader-apt,release-upgrader-dpkg
266+;SourcesList=prerequists-sources.list
267+;SourcesList-ia64=prerequists-sources.ports.list
268+;SourcesList-hppa=prerequists-sources.ports.list
269+
270+[Network]
271+MaxRetries=3
272+
273+[NonInteractive]
274+ForceOverwrite=yes
275+RealReboot=no
276+DebugBrokenScripts=no
277+DpkgProgressLog=no
278+;TerminalTimeout=2400
279diff --git a/data/DistUpgrade.cfg.hirsute b/data/DistUpgrade.cfg.hirsute
280new file mode 100644
281index 0000000..4f2fa65
282--- /dev/null
283+++ b/data/DistUpgrade.cfg.hirsute
284@@ -0,0 +1,131 @@
285+[View]
286+# the views will be tried in this order, if one fails to import, the next
287+# is tried
288+View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
289+#View=DistUpgradeViewNonInteractive
290+#Depends= apt (>= 1.0.10.2ubuntu2)
291+# the views below support upgrades over ssh connection
292+SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
293+
294+# Distro contains global information about the upgrade
295+[Distro]
296+# the meta-pkgs we support
297+MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-core,
298+ xubuntu-desktop, ubuntustudio-desktop, mythbuntu-desktop,
299+ kubuntu-netbook, lubuntu-desktop, ubuntu-gnome-desktop,
300+ ubuntu-mate-core, ubuntu-mate-desktop,
301+ ubuntukylin-desktop, ubuntu-budgie-desktop
302+BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
303+# minimal & standard, are handed via BaseMetaPkgs rule
304+# ubuntu-core is left-over task we forgot to remove
305+IgnoredTasks=minimal, standard, ubuntu-core
306+Demotions=demoted.cfg.hirsute
307+#RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
308+RemovalDenylistFile=removal_denylist.cfg
309+# if those packages were installed, make sure to keep them installed
310+KeepInstalledPkgs=xserver-xorg-video-all
311+KeepInstalledSection=translations
312+RemoveObsoletes=yes
313+PurgeObsoletes=yes
314+#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
315+# hints for for stuff that should be done right after the cache calculated
316+# the dist-upgrade (not to be confused with the PostUpgrade hooks in the
317+# quirks handling)
318+#PostUpgradePurge=linux-restricted-modules-common
319+#PostUpgradeRemove=xsettings-kde
320+#PostUpgradeUpgrade=brasero,edubuntu-desktop
321+#PostUpgradeInstall=apt
322+PostInstallScripts=./xorg_fix_proprietary.py
323+EnableApport=yes
324+# this supported deny listing certain versions to ensure we do not upgrade
325+# - blcr-dkms fails to build on kernel 2.6.35
326+#BadVersions=blcr-dkms_0.8.2-13
327+# ubiquity slideshow
328+#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
329+
330+# information about the individual meta-pkgs
331+[ubuntu-desktop]
332+KeyDependencies=lightdm, unity, ubuntu-artwork, ubuntu-sounds
333+# those pkgs will be marked remove right after the distUpgrade in the cache
334+PostUpgradeRemove=gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
335+ForcedObsoletes=desktop-effects, gnome-app-install, policykit-gnome, gnome-mount
336+
337+[kubuntu-desktop]
338+KeyDependencies=plasma-desktop, kubuntu-settings-desktop
339+PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager, kmix
340+# those packages are marked as obsolete right after the upgrade
341+ForcedObsoletes=ivman, gtk-qt-engine
342+# help the resolver a bit: LP: #1426132
343+PostUpgradeInstall=baloo-kf5
344+
345+[kubuntu-netbook]
346+KeyDependencies=plasma-netbook, kubuntu-settings-netbook
347+
348+[ubuntu-netbook]
349+KeyDependencies=gdm, ubuntu-netbook-default-settings
350+
351+[xubuntu-core]
352+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
353+PostUpgradeRemove=notification-daemon
354+
355+[xubuntu-desktop]
356+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
357+PostUpgradeRemove=notification-daemon
358+
359+[ubuntustudio-desktop]
360+KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look
361+
362+[ichthux-desktop]
363+KeyDependencies=ichthux-artwork, ichthux-default-settings
364+
365+[mythbuntu-desktop]
366+KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings
367+
368+[lubuntu-desktop]
369+KeyDependencies=lubuntu-artwork, lubuntu-default-settings
370+
371+[ubuntu-gnome-desktop]
372+KeyDependencies=ubuntu-gnome-default-settings, ubuntu-gnome-wallpapers
373+
374+[ubuntu-mate-core]
375+KeyDependencies=mate-desktop-environment-core, ubuntu-mate-default-settings, marco
376+PostUpgradeRemove=ibus,lightdm-gtk-greeter,lightdm-gtk-greeter-settings
377+
378+[ubuntu-mate-desktop]
379+KeyDependencies=ubuntu-mate-core, deja-dup-caja
380+PostUpgradeRemove=ibus,lightdm-gtk-greeter,lightdm-gtk-greeter-settings
381+
382+[ubuntukylin-desktop]
383+KeyDependencies=ubuntukylin-keyring, ubuntukylin-wallpapers, ubuntu-kylin-docs
384+
385+[ubuntu-budgie-desktop]
386+KeyDependencies=budgie-desktop-environment, budgie-welcome, ubuntu-budgie-themes
387+
388+[Files]
389+BackupExt=distUpgrade
390+LogDir=/var/log/dist-upgrade/
391+
392+[Sources]
393+From=hirsute
394+To=jammy
395+ValidOrigin=Ubuntu
396+ValidMirrors = mirrors.cfg
397+Components=main,restricted,universe,multiverse
398+Pockets=security,updates,proposed,backports
399+;AllowThirdParty=False
400+
401+;[PreRequists]
402+;Packages=release-upgrader-apt,release-upgrader-dpkg
403+;SourcesList=prerequists-sources.list
404+;SourcesList-ia64=prerequists-sources.ports.list
405+;SourcesList-hppa=prerequists-sources.ports.list
406+
407+[Network]
408+MaxRetries=3
409+
410+[NonInteractive]
411+ForceOverwrite=yes
412+RealReboot=no
413+DebugBrokenScripts=no
414+DpkgProgressLog=no
415+;TerminalTimeout=2400
416diff --git a/data/demoted.cfg.groovy b/data/demoted.cfg.groovy
417new file mode 120000
418index 0000000..65db89e
419--- /dev/null
420+++ b/data/demoted.cfg.groovy
421@@ -0,0 +1 @@
422+../utils/demoted.cfg.groovy
423\ No newline at end of file
424diff --git a/data/demoted.cfg.hirsute b/data/demoted.cfg.hirsute
425new file mode 120000
426index 0000000..b3ba87b
427--- /dev/null
428+++ b/data/demoted.cfg.hirsute
429@@ -0,0 +1 @@
430+../utils/demoted.cfg.hirsute
431\ No newline at end of file
432diff --git a/data/mirrors.cfg b/data/mirrors.cfg
433index ae29179..a591b41 100644
434--- a/data/mirrors.cfg
435+++ b/data/mirrors.cfg
436@@ -125,7 +125,6 @@ http://ucho.ignum.cz/ubuntu/
437 http://ftp.tudelft.nl/archive.ubuntu.com/
438 http://ftp.acc.umu.se/ubuntu/
439 http://ftp.snt.utwente.nl/pub/os/linux/ubuntu/
440-http://mirror.pnl.gov/ubuntu/
441 http://ubuntu.mirror.tudos.de/ubuntu/
442 http://ftp.byfly.by/ubuntu/
443 http://mirror.datacenter.by/ubuntu/
444@@ -271,7 +270,6 @@ http://mirrors.nxthost.com/ubuntu/
445 http://mirror.xeonbd.com/ubuntu-archive/
446 http://ubuntu.colocall.net/ubuntu/
447 http://ubuntu.mirror.serverloft.de/ubuntu/
448-http://ftp.ntou.edu.tw/ubuntu/
449 http://ubuntu.mirrors.linux.ro/archive/
450 http://mirror.intergrid.com.au/ubuntu/
451 http://mirror.nl.datapacket.com/ubuntu/
452@@ -309,7 +307,6 @@ http://mirror1.totbb.net/ubuntu/
453 http://mirrors.psu.ac.th/ubuntu/
454 http://ubuntu.turhost.com/ubuntu/
455 http://mirror.hostnet.nl/ubuntu/archive/
456-http://mirror-hk.koddos.net/ubuntu/
457 http://mirror.uoregon.edu/ubuntu/
458 http://ubuntu.mirrors.theom.nz/
459 http://mirror.operationtulip.com/ubuntu/
460@@ -423,8 +420,6 @@ http://mirror.easyname.at/ubuntu-archive/
461 http://ftp.ntua.gr/ubuntu/
462 https://mirrors.switch.ca/ubuntu/
463 http://ftp.caliu.cat/pub/distribucions/ubuntu/archive/
464-https://ftp.harukasan.org/ubuntu/
465-https://ftp.harukasan.org/ubuntu-ports/
466 https://mirror.dogado.de/ubuntu/
467 https://quantum-mirror.hu/mirrors/pub/ubuntu/
468 https://mirror.kku.ac.th/ubuntu/
469@@ -466,7 +461,6 @@ https://nyc.mirrors.clouvider.net/ubuntu/
470 https://mirror.telepoint.bg/ubuntu/
471 https://mirror.de.vangus.co.il/ubuntu/
472 https://mirror.nl.bontekoe.technology/ubuntu/
473-https://ubuntu.unlimited.rs/
474 https://ubuntu.ch.altushost.com/
475 https://mirror.sabay.com.kh/ubuntu/
476 http://mirrors.dgut.edu.cn/ubuntu/
477@@ -517,7 +511,6 @@ https://mirror.uepg.br/ubuntu/
478 https://mirror.23m.com/ubuntu/
479 https://dal.mirrors.clouvider.net/ubuntu/
480 http://repos.del.extreme-ix.org/ubuntu/
481-http://ftp.vectranet.pl/ubuntu/
482 https://buaya.klas.or.id/ubuntu/
483 https://ubuntu.netforce.hosting/ubuntu/
484 https://repo.ialab.dsu.edu/ubuntu/
485@@ -589,7 +582,6 @@ http://mirror.cloudxchange.id/ubuntu/
486 http://mirror.dlut.edu.cn/ubuntu/
487 https://mirror.vpsnet.com/ubuntu/
488 https://ftp.ulak.net.tr/ubuntu/
489-https://ftp.udx.icscoe.jp/Linux/ubuntu/
490 https://mirror.dal.nexril.net/ubuntu/
491 https://mirror.gi.co.id/ubuntu/
492 http://mirrors.piconets.webwerks.in/ubuntu-mirror/ubuntu/
493@@ -602,6 +594,7 @@ https://mirror.cxserv.de/ubuntu/
494 https://mirror.cs.pitt.edu/ubuntu/archive/
495 https://mirror.fcix.net/ubuntu/
496 http://mirror.labkom.id/ubuntu/
497+<<<<<<< data/mirrors.cfg
498 https://mirror.netsite.dk/ubuntu/archive/
499 https://mirrors.storpool.com/ubuntu/archive/
500 https://ubuntu.mirrors.orange.ro/ubuntu-archive/
501@@ -641,3 +634,42 @@ https://mirror1.grupocg.cl/ubuntu/
502 http://mirror.unej.ac.id/ubuntu/
503 https://mirror.lstn.net/ubuntu/
504 https://mirror.alwyzon.net/ubuntu/
505+=======
506+https://mirror.hep.gg/ubuntu/
507+https://mirror.netsite.dk/ubuntu/archive/
508+https://mirror.kkg.berlin/ubuntu/
509+https://mirror.highland-networks.com/ubuntu/
510+https://ubuntu-repos.bom.anuragbhatia.com/
511+https://ubuntu.mirrors.orange.ro/ubuntu-archive/
512+https://mirror.lostpacket.org/cdn/ubuntu/
513+https://mirror.mia.velocihost.net/ubuntu/
514+http://mirror.onevip.mk/ubuntu/
515+http://mirror.cedille.club/ubuntu/
516+https://mirrors.storpool.com/ubuntu/archive/
517+https://mirror.clarkson.edu/ubuntu/
518+https://mirror.nevacloud.com/ubuntu/ubuntu-archive/
519+http://mirror.soonkeat.sg/ubuntu/
520+https://ftp.ps.pl/pub/Linux/ubuntu/archive/
521+https://mirrors.gbnetwork.com/ubuntu/
522+https://mirror.xtx.cloud/ubuntu/
523+http://mirror.nerdmilio.com/ubuntu/
524+https://mirror.webworld.ie/ubuntu/
525+http://ftp.mirror.tw/pub/ubuntu/ubuntu/
526+https://it2.mirror.vhosting-it.com/ubuntu/
527+https://mirrors.nxtgen.com/ubuntu-mirror/ubuntu/
528+http://debian.linux.org.tw/ubuntu/
529+http://mirror.serverion.com/ubuntu/
530+https://mirrors.nav.ro/ubuntu/
531+https://it1.mirror.vhosting-it.com/ubuntu/
532+https://mirror.scaleuptech.com/ubuntu/
533+https://ubuntu-mirror.magnetic-it.com/ubuntu/
534+http://mirror.retentionrange.co.bw/ubuntu/
535+http://mirror.lnx-solutions.com/ubuntu/
536+https://mirror.lstn.net/ubuntu/
537+https://mirror1.grupocg.cl/ubuntu/
538+http://mirror.unej.ac.id/ubuntu/
539+http://mirrors.evoluso.com/ubuntu/
540+https://ubuntu.hi.no/archive/
541+https://mirror.alwyzon.net/ubuntu/
542+https://mirrors.xjtu.edu.cn/ubuntu/
543+>>>>>>> data/mirrors.cfg
544diff --git a/debian/changelog b/debian/changelog
545index 08bbb6d..a6ea53d 100644
546--- a/debian/changelog
547+++ b/debian/changelog
548@@ -1,3 +1,4 @@
549+<<<<<<< debian/changelog
550 ubuntu-release-upgrader (1:22.10.6) kinetic; urgency=medium
551
552 * utils/demotions.py: check old-releases.u.c so that we can generate
553@@ -47,6 +48,44 @@ ubuntu-release-upgrader (1:22.10.1) kinetic; urgency=medium
554 * Run pre-build.sh: updating mirrors, demotions, and translations.
555
556 -- Nick Rosbrook <nick.rosbrook@canonical.com> Thu, 28 Apr 2022 13:56:43 -0700
557+=======
558+ubuntu-release-upgrader (1:22.04.13) UNRELEASED; urgency=medium
559+
560+ * quirk: fix nvidia driver autoremoval issue (LP: #1955047)
561+
562+ -- Simon Chopin <schopin@ubuntu.com> Tue, 02 Aug 2022 15:45:26 +0200
563+
564+ubuntu-release-upgrader (1:22.04.12) jammy; urgency=medium
565+
566+ [ Brian Murray ]
567+ * Add support for upgrading from End of Life releases (Ubuntu 20.10 and
568+ Ubuntu 21.04) to Ubuntu 22.04. (LP: #1975533)
569+ * DistUpgrade: Do not attempt to reboot in WSL. (LP: #1958668)
570+ * DistUpgrade/deb2snap.json: gnome-3-34-1804 is no longer a seeded snap and
571+ should not be refreshed. (LP: #1981485)
572+ * Run pre-build.sh: updating mirrors, demotions, and translations.
573+
574+ [ William 'jawn-smith' Wilson ]
575+ * tests/test_quirks.py: Remove declaration of unused variables
576+
577+ -- Brian Murray <brian@ubuntu.com> Tue, 19 Jul 2022 06:52:28 -0700
578+
579+ubuntu-release-upgrader (1:22.04.11) jammy; urgency=medium
580+
581+ [ William 'jawn-smith' Wilson ]
582+ * DistUpgrade/DistUpgradeQuirks.py: Remove section of netplan
583+ config that is installed by default on Raspberry Pi and
584+ causes netplan failures after upgrade to jammy (LP: #1970761)
585+
586+ [ Nick Rosbrook ]
587+ * DistUpgrade: Gracefully handle missing dbus module (LP: #1965568).
588+ * DistUpgrade: Do not show lock screen error if XDG_SESSION_TYPE is
589+ tty (LP: #1973785).
590+ * DistUpgrade: Add deb2snap entry for snapd-desktop-integration (LP: #1975747).
591+ * Run pre-build.sh: updating mirrors, demotions, and translations.
592+
593+ -- Nick Rosbrook <nick.rosbrook@canonical.com> Thu, 26 May 2022 10:49:26 -0400
594+>>>>>>> debian/changelog
595
596 ubuntu-release-upgrader (1:22.04.10) jammy; urgency=medium
597
598diff --git a/debian/control b/debian/control
599index 1e9dcf6..1ef4a0e 100644
600--- a/debian/control
601+++ b/debian/control
602@@ -42,6 +42,7 @@ Depends: ${python3:Depends},
603 python3-apt (>= 0.8.5~),
604 python3-dbus,
605 python3-distro-info,
606+ python3-yaml,
607 gpgv,
608 lsb-release,
609 sensible-utils,
610diff --git a/debian/tests/control b/debian/tests/control
611index 3e0fa69..222ddfb 100644
612--- a/debian/tests/control
613+++ b/debian/tests/control
614@@ -1,2 +1,2 @@
615 Tests: nose-tests
616-Depends: @, gir1.2-webkit2-4.0, python3-mock, python3-nose, xvfb, python3-apport, pycodestyle
617+Depends: @, gir1.2-webkit2-4.0, python3-mock, python3-nose, xvfb, python3-apport, pycodestyle, python3-yaml
618diff --git a/po/af.po b/po/af.po
619index f823f0b..bd2ae1d 100644
620--- a/po/af.po
621+++ b/po/af.po
622@@ -8,7 +8,11 @@ msgid ""
623 msgstr ""
624 "Project-Id-Version: update-manager\n"
625 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
626+<<<<<<< po/af.po
627 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
628+=======
629+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
630+>>>>>>> po/af.po
631 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
632 "Last-Translator: Brian Murray <brian@ubuntu.com>\n"
633 "Language-Team: Afrikaans <af@li.org>\n"
634@@ -1056,12 +1060,12 @@ msgstr "Plaas asseblief '%s' in dryf '%s'"
635 msgid "Media Change"
636 msgstr "Media verwisseling"
637
638-#: ../DistUpgrade/DistUpgradeQuirks.py:235
639+#: ../DistUpgrade/DistUpgradeQuirks.py:236
640 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
641 msgstr ""
642 "Jou grafika apparatuur is dalk nie ten volle ondersteun in Ubuntu 14.04."
643
644-#: ../DistUpgrade/DistUpgradeQuirks.py:237
645+#: ../DistUpgrade/DistUpgradeQuirks.py:238
646 msgid ""
647 "Running the 'unity' desktop environment is not fully supported by your "
648 "graphics hardware. You will maybe end up in a very slow environment after "
649@@ -1076,13 +1080,13 @@ msgstr ""
650 "inligting, sien https://wiki.ubuntu.com/X/Bugs/"
651 "UpdateManagerWarningForUnity3D Wil jy steeds voortgaan met die opgrader?"
652
653-#: ../DistUpgrade/DistUpgradeQuirks.py:261
654+#: ../DistUpgrade/DistUpgradeQuirks.py:262
655 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
656 msgstr ""
657 "Jou grafikahardeware is dalk nie ten volle ondersteun in Ubuntu 12,04 LTS "
658 "nie."
659
660-#: ../DistUpgrade/DistUpgradeQuirks.py:263
661+#: ../DistUpgrade/DistUpgradeQuirks.py:264
662 msgid ""
663 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
664 "and you may encounter problems after the upgrade. For more information see "
665@@ -1094,7 +1098,7 @@ msgstr ""
666 "sien https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Wil jy "
667 "voortgaan met die opgrader?"
668
669-#: ../DistUpgrade/DistUpgradeQuirks.py:283
670+#: ../DistUpgrade/DistUpgradeQuirks.py:284
671 msgid ""
672 "Upgrading may reduce desktop effects, and performance in games and other "
673 "graphically intensive programs."
674@@ -1102,7 +1106,7 @@ msgstr ""
675 "Opgradering kan dalk werkskerm effekte en werkverrigting in speletjies en "
676 "ander grafies intensiewe programme verminder."
677
678-#: ../DistUpgrade/DistUpgradeQuirks.py:287
679+#: ../DistUpgrade/DistUpgradeQuirks.py:288
680 msgid ""
681 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
682 "of this driver is available that works with your hardware in Ubuntu 10.04 "
683@@ -1116,12 +1120,12 @@ msgstr ""
684 "\n"
685 "Wil jy voortgaan?"
686
687-#: ../DistUpgrade/DistUpgradeQuirks.py:326
688-#: ../DistUpgrade/DistUpgradeQuirks.py:395
689+#: ../DistUpgrade/DistUpgradeQuirks.py:327
690+#: ../DistUpgrade/DistUpgradeQuirks.py:396
691 msgid "Sorry, no more upgrades for this system"
692 msgstr "Jammer, geen opgraderings meer vir hierdie stelsel nie"
693
694-#: ../DistUpgrade/DistUpgradeQuirks.py:327
695+#: ../DistUpgrade/DistUpgradeQuirks.py:328
696 #, python-format
697 msgid ""
698 "There will not be any further Ubuntu releases for this system's 'i386' "
699@@ -1134,11 +1138,11 @@ msgstr ""
700 "\n"
701 "Opdaterings vir Ubuntu %s sal voortgaan tot %s."
702
703-#: ../DistUpgrade/DistUpgradeQuirks.py:342
704+#: ../DistUpgrade/DistUpgradeQuirks.py:343
705 msgid "No ARMv6 CPU"
706 msgstr "Geen ARMv6 verwerker"
707
708-#: ../DistUpgrade/DistUpgradeQuirks.py:343
709+#: ../DistUpgrade/DistUpgradeQuirks.py:344
710 msgid ""
711 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
712 "packages in karmic were built with optimizations requiring ARMv6 as the "
713@@ -1150,12 +1154,12 @@ msgstr ""
714 "argitektuur. Dit is nie moontlik om jou stelsel op te gradeer na 'n nuwe "
715 "Ubuntu vrystelling met hierdie hardeware."
716
717-#: ../DistUpgrade/DistUpgradeQuirks.py:363
718+#: ../DistUpgrade/DistUpgradeQuirks.py:364
719 msgid ""
720 "Sorry, this storage driver is not supported in kernels for newer releases"
721 msgstr ""
722
723-#: ../DistUpgrade/DistUpgradeQuirks.py:365
724+#: ../DistUpgrade/DistUpgradeQuirks.py:366
725 #, python-format
726 msgid ""
727 "There will not be any further Ubuntu releases that provide kernel support "
728@@ -1165,7 +1169,7 @@ msgid ""
729 "driver, remove the directory %s and try again."
730 msgstr ""
731
732-#: ../DistUpgrade/DistUpgradeQuirks.py:396
733+#: ../DistUpgrade/DistUpgradeQuirks.py:397
734 #, fuzzy, python-format
735 msgid ""
736 "There will not be any further Ubuntu releases for this system's POWER8 "
737@@ -1178,11 +1182,11 @@ msgstr ""
738 "\n"
739 "Opdaterings vir Ubuntu %s sal voortgaan tot %s."
740
741-#: ../DistUpgrade/DistUpgradeQuirks.py:414
742+#: ../DistUpgrade/DistUpgradeQuirks.py:415
743 msgid "No init available"
744 msgstr "Geen init beskikbaar"
745
746-#: ../DistUpgrade/DistUpgradeQuirks.py:415
747+#: ../DistUpgrade/DistUpgradeQuirks.py:416
748 msgid ""
749 "Your system appears to be a virtualised environment without an init daemon, "
750 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
751@@ -1198,11 +1202,11 @@ msgstr ""
752 "\n"
753 "Is jy seker jy wil voortgaan?"
754
755-#: ../DistUpgrade/DistUpgradeQuirks.py:456
756+#: ../DistUpgrade/DistUpgradeQuirks.py:457
757 msgid "The Robot Operating System (ROS) is installed"
758 msgstr ""
759
760-#: ../DistUpgrade/DistUpgradeQuirks.py:457
761+#: ../DistUpgrade/DistUpgradeQuirks.py:458
762 msgid ""
763 "It appears that ROS is currently installed. Each ROS release is very strict "
764 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
765@@ -1219,12 +1223,12 @@ msgid ""
766 "Are you sure you want to continue?"
767 msgstr ""
768
769-#: ../DistUpgrade/DistUpgradeQuirks.py:582
770+#: ../DistUpgrade/DistUpgradeQuirks.py:583
771 #, fuzzy
772 msgid "Connection to the Snap Store failed"
773 msgstr "Verbinding aan snap Winkel gefaal"
774
775-#: ../DistUpgrade/DistUpgradeQuirks.py:583
776+#: ../DistUpgrade/DistUpgradeQuirks.py:584
777 msgid ""
778 "You have the package lxd installed but your system is unable to reach the "
779 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
780@@ -1234,11 +1238,11 @@ msgid ""
781 "may want to configure a Snap Store proxy."
782 msgstr ""
783
784-#: ../DistUpgrade/DistUpgradeQuirks.py:598
785+#: ../DistUpgrade/DistUpgradeQuirks.py:599
786 msgid "Connection to Snap Store failed"
787 msgstr "Verbinding aan snap Winkel gefaal"
788
789-#: ../DistUpgrade/DistUpgradeQuirks.py:599
790+#: ../DistUpgrade/DistUpgradeQuirks.py:600
791 msgid ""
792 "Your system does not have a connection to the Snap Store. For the best "
793 "upgrade experience make sure that your system can connect to api.snapcraft."
794@@ -1250,11 +1254,11 @@ msgstr ""
795 "io.\n"
796 "Wil jy steeds voortgaan met die opgradering?"
797
798-#: ../DistUpgrade/DistUpgradeQuirks.py:608
799+#: ../DistUpgrade/DistUpgradeQuirks.py:609
800 msgid "Outdated snapd package"
801 msgstr "Verouderde snapd pakket"
802
803-#: ../DistUpgrade/DistUpgradeQuirks.py:609
804+#: ../DistUpgrade/DistUpgradeQuirks.py:610
805 msgid ""
806 "Your system does not have the latest version of snapd. Please update the "
807 "version of snapd on your system to improve the upgrade experience.\n"
808@@ -1266,34 +1270,34 @@ msgstr ""
809
810 #. now perform direct API calls to the store, requesting size
811 #. information for each of the snaps needing installation
812-#: ../DistUpgrade/DistUpgradeQuirks.py:634
813+#: ../DistUpgrade/DistUpgradeQuirks.py:635
814 msgid "Calculating snap size requirements"
815 msgstr "Berekening van snap grootte vereistes"
816
817-#: ../DistUpgrade/DistUpgradeQuirks.py:665
818+#: ../DistUpgrade/DistUpgradeQuirks.py:666
819 msgid "Processing snap replacements"
820 msgstr "Verwerking snap plaasvervangers"
821
822-#: ../DistUpgrade/DistUpgradeQuirks.py:671
823+#: ../DistUpgrade/DistUpgradeQuirks.py:672
824 #, python-format
825 msgid "refreshing snap %s"
826 msgstr "verfris snap %s"
827
828-#: ../DistUpgrade/DistUpgradeQuirks.py:675
829+#: ../DistUpgrade/DistUpgradeQuirks.py:676
830 #, fuzzy, python-format
831 msgid "removing snap %s"
832 msgstr "verfris snap %s"
833
834-#: ../DistUpgrade/DistUpgradeQuirks.py:678
835+#: ../DistUpgrade/DistUpgradeQuirks.py:679
836 #, python-format
837 msgid "installing snap %s"
838 msgstr "installeer snap %s"
839
840-#: ../DistUpgrade/DistUpgradeQuirks.py:707
841+#: ../DistUpgrade/DistUpgradeQuirks.py:708
842 msgid "PAE not enabled"
843 msgstr "PAE nie geaktiveer"
844
845-#: ../DistUpgrade/DistUpgradeQuirks.py:708
846+#: ../DistUpgrade/DistUpgradeQuirks.py:709
847 msgid ""
848 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
849 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
850@@ -1305,11 +1309,11 @@ msgstr ""
851 "weergawe van Ubuntu, moet jy PAE (indien dit moontlik is) sien:\n"
852 "http://help.ubuntu.com/community/EnablingPAE"
853
854-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
855+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
856 msgid "universe component not enabled"
857 msgstr ""
858
859-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
860+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
861 #, python-format
862 msgid ""
863 "You have the package %s installed which is a python2 package. python2 has "
864@@ -1321,7 +1325,7 @@ msgid ""
865 "universe component in /etc/apt/sources.list or remove %s"
866 msgstr ""
867
868-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
869+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
870 msgid "Checking for installed snaps"
871 msgstr "Kontrolering vir geïnstalleerde snaps"
872
873diff --git a/po/am.po b/po/am.po
874index 5d57dbd..fcdcc2b 100644
875--- a/po/am.po
876+++ b/po/am.po
877@@ -8,7 +8,11 @@ msgid ""
878 msgstr ""
879 "Project-Id-Version: update-manager\n"
880 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
881+<<<<<<< po/am.po
882 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
883+=======
884+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
885+>>>>>>> po/am.po
886 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
887 "Last-Translator: Brian Murray <brian@ubuntu.com>\n"
888 "Language-Team: Amharic <am@li.org>\n"
889@@ -961,11 +965,11 @@ msgstr "እባክዎ ያስገቡ '%s' በመንጂያው ውስጥ '%s'"
890 msgid "Media Change"
891 msgstr "የሜዲያ ለውጥ"
892
893-#: ../DistUpgrade/DistUpgradeQuirks.py:235
894+#: ../DistUpgrade/DistUpgradeQuirks.py:236
895 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
896 msgstr "የ እርስዎ graphics ጠንካራ አክል ሙሉ በ ሙሉ የ ተደገፈ ላይሆን ይችላል በ ኡቡንቱ 14.04."
897
898-#: ../DistUpgrade/DistUpgradeQuirks.py:237
899+#: ../DistUpgrade/DistUpgradeQuirks.py:238
900 msgid ""
901 "Running the 'unity' desktop environment is not fully supported by your "
902 "graphics hardware. You will maybe end up in a very slow environment after "
903@@ -979,11 +983,11 @@ msgstr ""
904 "መረጃ ይህን ይመልከቱ: https://wiki.ubuntu.com/X/Bugs/"
905 "UpdateManagerWarningForUnity3D እርስዎ ማሻሻሉን መቀጠል ይፈልጋሉ?"
906
907-#: ../DistUpgrade/DistUpgradeQuirks.py:261
908+#: ../DistUpgrade/DistUpgradeQuirks.py:262
909 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
910 msgstr "የ እርስዎ graphics hardware በ ሙሉ የተደገፈ አይደለም በ ኡቡንቱ 12.04 LTS."
911
912-#: ../DistUpgrade/DistUpgradeQuirks.py:263
913+#: ../DistUpgrade/DistUpgradeQuirks.py:264
914 msgid ""
915 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
916 "and you may encounter problems after the upgrade. For more information see "
917@@ -994,7 +998,7 @@ msgstr ""
918 "ሊያጋጥምዎት ይችላል ከ ተሻሻለ በኋላ: ለ በለጠ መረጃ ይህን ይመልከቱ https://wiki.ubuntu.com/X/Bugs/"
919 "UpdateManagerWarningForI8xx እርስዎ ማሻሻሉን መቀጠል ይፈልጋሉ?"
920
921-#: ../DistUpgrade/DistUpgradeQuirks.py:283
922+#: ../DistUpgrade/DistUpgradeQuirks.py:284
923 msgid ""
924 "Upgrading may reduce desktop effects, and performance in games and other "
925 "graphically intensive programs."
926@@ -1002,7 +1006,7 @@ msgstr ""
927 "ማሻሻል የ ዴስክቶፕ ውጤቶችን ሊቀንስ ይችላል: ጨዋታዎች በሚጫወቱ ጊዜ ወይንም ሀይለኛ graphics ፕሮግራሞችን "
928 "በሚጠቀሙ ጊዜ"
929
930-#: ../DistUpgrade/DistUpgradeQuirks.py:287
931+#: ../DistUpgrade/DistUpgradeQuirks.py:288
932 msgid ""
933 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
934 "of this driver is available that works with your hardware in Ubuntu 10.04 "
935@@ -1015,12 +1019,12 @@ msgstr ""
936 "\n"
937 "እርስዎ በ እርግጥ መቀጠል ይፈልጋሉ?"
938
939-#: ../DistUpgrade/DistUpgradeQuirks.py:326
940-#: ../DistUpgrade/DistUpgradeQuirks.py:395
941+#: ../DistUpgrade/DistUpgradeQuirks.py:327
942+#: ../DistUpgrade/DistUpgradeQuirks.py:396
943 msgid "Sorry, no more upgrades for this system"
944 msgstr ""
945
946-#: ../DistUpgrade/DistUpgradeQuirks.py:327
947+#: ../DistUpgrade/DistUpgradeQuirks.py:328
948 #, python-format
949 msgid ""
950 "There will not be any further Ubuntu releases for this system's 'i386' "
951@@ -1029,11 +1033,11 @@ msgid ""
952 "Updates for Ubuntu %s will continue until %s."
953 msgstr ""
954
955-#: ../DistUpgrade/DistUpgradeQuirks.py:342
956+#: ../DistUpgrade/DistUpgradeQuirks.py:343
957 msgid "No ARMv6 CPU"
958 msgstr "No ARMv6 CPU"
959
960-#: ../DistUpgrade/DistUpgradeQuirks.py:343
961+#: ../DistUpgrade/DistUpgradeQuirks.py:344
962 msgid ""
963 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
964 "packages in karmic were built with optimizations requiring ARMv6 as the "
965@@ -1041,12 +1045,12 @@ msgid ""
966 "Ubuntu release with this hardware."
967 msgstr ""
968
969-#: ../DistUpgrade/DistUpgradeQuirks.py:363
970+#: ../DistUpgrade/DistUpgradeQuirks.py:364
971 msgid ""
972 "Sorry, this storage driver is not supported in kernels for newer releases"
973 msgstr ""
974
975-#: ../DistUpgrade/DistUpgradeQuirks.py:365
976+#: ../DistUpgrade/DistUpgradeQuirks.py:366
977 #, python-format
978 msgid ""
979 "There will not be any further Ubuntu releases that provide kernel support "
980@@ -1056,7 +1060,7 @@ msgid ""
981 "driver, remove the directory %s and try again."
982 msgstr ""
983
984-#: ../DistUpgrade/DistUpgradeQuirks.py:396
985+#: ../DistUpgrade/DistUpgradeQuirks.py:397
986 #, python-format
987 msgid ""
988 "There will not be any further Ubuntu releases for this system's POWER8 "
989@@ -1065,11 +1069,11 @@ msgid ""
990 "Updates for Ubuntu %s will continue until %s."
991 msgstr ""
992
993-#: ../DistUpgrade/DistUpgradeQuirks.py:414
994+#: ../DistUpgrade/DistUpgradeQuirks.py:415
995 msgid "No init available"
996 msgstr "ምንም ማስጀመሪያ ዝግጁ አይደለም"
997
998-#: ../DistUpgrade/DistUpgradeQuirks.py:415
999+#: ../DistUpgrade/DistUpgradeQuirks.py:416
1000 msgid ""
1001 "Your system appears to be a virtualised environment without an init daemon, "
1002 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
1003@@ -1079,11 +1083,11 @@ msgid ""
1004 "Are you sure you want to continue?"
1005 msgstr ""
1006
1007-#: ../DistUpgrade/DistUpgradeQuirks.py:456
1008+#: ../DistUpgrade/DistUpgradeQuirks.py:457
1009 msgid "The Robot Operating System (ROS) is installed"
1010 msgstr ""
1011
1012-#: ../DistUpgrade/DistUpgradeQuirks.py:457
1013+#: ../DistUpgrade/DistUpgradeQuirks.py:458
1014 msgid ""
1015 "It appears that ROS is currently installed. Each ROS release is very strict "
1016 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
1017@@ -1100,11 +1104,11 @@ msgid ""
1018 "Are you sure you want to continue?"
1019 msgstr ""
1020
1021-#: ../DistUpgrade/DistUpgradeQuirks.py:582
1022+#: ../DistUpgrade/DistUpgradeQuirks.py:583
1023 msgid "Connection to the Snap Store failed"
1024 msgstr ""
1025
1026-#: ../DistUpgrade/DistUpgradeQuirks.py:583
1027+#: ../DistUpgrade/DistUpgradeQuirks.py:584
1028 msgid ""
1029 "You have the package lxd installed but your system is unable to reach the "
1030 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
1031@@ -1114,11 +1118,11 @@ msgid ""
1032 "may want to configure a Snap Store proxy."
1033 msgstr ""
1034
1035-#: ../DistUpgrade/DistUpgradeQuirks.py:598
1036+#: ../DistUpgrade/DistUpgradeQuirks.py:599
1037 msgid "Connection to Snap Store failed"
1038 msgstr ""
1039
1040-#: ../DistUpgrade/DistUpgradeQuirks.py:599
1041+#: ../DistUpgrade/DistUpgradeQuirks.py:600
1042 msgid ""
1043 "Your system does not have a connection to the Snap Store. For the best "
1044 "upgrade experience make sure that your system can connect to api.snapcraft."
1045@@ -1126,11 +1130,11 @@ msgid ""
1046 "Do you still want to continue with the upgrade?"
1047 msgstr ""
1048
1049-#: ../DistUpgrade/DistUpgradeQuirks.py:608
1050+#: ../DistUpgrade/DistUpgradeQuirks.py:609
1051 msgid "Outdated snapd package"
1052 msgstr ""
1053
1054-#: ../DistUpgrade/DistUpgradeQuirks.py:609
1055+#: ../DistUpgrade/DistUpgradeQuirks.py:610
1056 msgid ""
1057 "Your system does not have the latest version of snapd. Please update the "
1058 "version of snapd on your system to improve the upgrade experience.\n"
1059@@ -1139,34 +1143,34 @@ msgstr ""
1060
1061 #. now perform direct API calls to the store, requesting size
1062 #. information for each of the snaps needing installation
1063-#: ../DistUpgrade/DistUpgradeQuirks.py:634
1064+#: ../DistUpgrade/DistUpgradeQuirks.py:635
1065 msgid "Calculating snap size requirements"
1066 msgstr ""
1067
1068-#: ../DistUpgrade/DistUpgradeQuirks.py:665
1069+#: ../DistUpgrade/DistUpgradeQuirks.py:666
1070 msgid "Processing snap replacements"
1071 msgstr ""
1072
1073-#: ../DistUpgrade/DistUpgradeQuirks.py:671
1074+#: ../DistUpgrade/DistUpgradeQuirks.py:672
1075 #, python-format
1076 msgid "refreshing snap %s"
1077 msgstr ""
1078
1079-#: ../DistUpgrade/DistUpgradeQuirks.py:675
1080+#: ../DistUpgrade/DistUpgradeQuirks.py:676
1081 #, python-format
1082 msgid "removing snap %s"
1083 msgstr ""
1084
1085-#: ../DistUpgrade/DistUpgradeQuirks.py:678
1086+#: ../DistUpgrade/DistUpgradeQuirks.py:679
1087 #, python-format
1088 msgid "installing snap %s"
1089 msgstr ""
1090
1091-#: ../DistUpgrade/DistUpgradeQuirks.py:707
1092+#: ../DistUpgrade/DistUpgradeQuirks.py:708
1093 msgid "PAE not enabled"
1094 msgstr "PAE አላስቻሉም"
1095
1096-#: ../DistUpgrade/DistUpgradeQuirks.py:708
1097+#: ../DistUpgrade/DistUpgradeQuirks.py:709
1098 msgid ""
1099 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
1100 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
1101@@ -1178,11 +1182,11 @@ msgstr ""
1102 "ከሆነ) ይህን ይመልከቱ:\n"
1103 "http://help.ubuntu.com/community/EnablingPAE"
1104
1105-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
1106+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
1107 msgid "universe component not enabled"
1108 msgstr ""
1109
1110-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
1111+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
1112 #, python-format
1113 msgid ""
1114 "You have the package %s installed which is a python2 package. python2 has "
1115@@ -1194,7 +1198,7 @@ msgid ""
1116 "universe component in /etc/apt/sources.list or remove %s"
1117 msgstr ""
1118
1119-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
1120+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
1121 msgid "Checking for installed snaps"
1122 msgstr ""
1123
1124diff --git a/po/an.po b/po/an.po
1125index 29e09aa..fe33501 100644
1126--- a/po/an.po
1127+++ b/po/an.po
1128@@ -8,7 +8,11 @@ msgid ""
1129 msgstr ""
1130 "Project-Id-Version: update-manager\n"
1131 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
1132+<<<<<<< po/an.po
1133 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
1134+=======
1135+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
1136+>>>>>>> po/an.po
1137 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
1138 "Last-Translator: Daniel Martinez <entaltoaragon@gmail.com>\n"
1139 "Language-Team: Aragonese <an@li.org>\n"
1140@@ -908,11 +912,11 @@ msgstr ""
1141 msgid "Media Change"
1142 msgstr ""
1143
1144-#: ../DistUpgrade/DistUpgradeQuirks.py:235
1145+#: ../DistUpgrade/DistUpgradeQuirks.py:236
1146 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
1147 msgstr ""
1148
1149-#: ../DistUpgrade/DistUpgradeQuirks.py:237
1150+#: ../DistUpgrade/DistUpgradeQuirks.py:238
1151 msgid ""
1152 "Running the 'unity' desktop environment is not fully supported by your "
1153 "graphics hardware. You will maybe end up in a very slow environment after "
1154@@ -922,11 +926,11 @@ msgid ""
1155 "upgrade?"
1156 msgstr ""
1157
1158-#: ../DistUpgrade/DistUpgradeQuirks.py:261
1159+#: ../DistUpgrade/DistUpgradeQuirks.py:262
1160 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
1161 msgstr ""
1162
1163-#: ../DistUpgrade/DistUpgradeQuirks.py:263
1164+#: ../DistUpgrade/DistUpgradeQuirks.py:264
1165 msgid ""
1166 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
1167 "and you may encounter problems after the upgrade. For more information see "
1168@@ -934,13 +938,13 @@ msgid ""
1169 "continue with the upgrade?"
1170 msgstr ""
1171
1172-#: ../DistUpgrade/DistUpgradeQuirks.py:283
1173+#: ../DistUpgrade/DistUpgradeQuirks.py:284
1174 msgid ""
1175 "Upgrading may reduce desktop effects, and performance in games and other "
1176 "graphically intensive programs."
1177 msgstr ""
1178
1179-#: ../DistUpgrade/DistUpgradeQuirks.py:287
1180+#: ../DistUpgrade/DistUpgradeQuirks.py:288
1181 msgid ""
1182 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
1183 "of this driver is available that works with your hardware in Ubuntu 10.04 "
1184@@ -949,12 +953,12 @@ msgid ""
1185 "Do you want to continue?"
1186 msgstr ""
1187
1188-#: ../DistUpgrade/DistUpgradeQuirks.py:326
1189-#: ../DistUpgrade/DistUpgradeQuirks.py:395
1190+#: ../DistUpgrade/DistUpgradeQuirks.py:327
1191+#: ../DistUpgrade/DistUpgradeQuirks.py:396
1192 msgid "Sorry, no more upgrades for this system"
1193 msgstr ""
1194
1195-#: ../DistUpgrade/DistUpgradeQuirks.py:327
1196+#: ../DistUpgrade/DistUpgradeQuirks.py:328
1197 #, python-format
1198 msgid ""
1199 "There will not be any further Ubuntu releases for this system's 'i386' "
1200@@ -963,11 +967,11 @@ msgid ""
1201 "Updates for Ubuntu %s will continue until %s."
1202 msgstr ""
1203
1204-#: ../DistUpgrade/DistUpgradeQuirks.py:342
1205+#: ../DistUpgrade/DistUpgradeQuirks.py:343
1206 msgid "No ARMv6 CPU"
1207 msgstr ""
1208
1209-#: ../DistUpgrade/DistUpgradeQuirks.py:343
1210+#: ../DistUpgrade/DistUpgradeQuirks.py:344
1211 msgid ""
1212 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
1213 "packages in karmic were built with optimizations requiring ARMv6 as the "
1214@@ -975,12 +979,12 @@ msgid ""
1215 "Ubuntu release with this hardware."
1216 msgstr ""
1217
1218-#: ../DistUpgrade/DistUpgradeQuirks.py:363
1219+#: ../DistUpgrade/DistUpgradeQuirks.py:364
1220 msgid ""
1221 "Sorry, this storage driver is not supported in kernels for newer releases"
1222 msgstr ""
1223
1224-#: ../DistUpgrade/DistUpgradeQuirks.py:365
1225+#: ../DistUpgrade/DistUpgradeQuirks.py:366
1226 #, python-format
1227 msgid ""
1228 "There will not be any further Ubuntu releases that provide kernel support "
1229@@ -990,7 +994,7 @@ msgid ""
1230 "driver, remove the directory %s and try again."
1231 msgstr ""
1232
1233-#: ../DistUpgrade/DistUpgradeQuirks.py:396
1234+#: ../DistUpgrade/DistUpgradeQuirks.py:397
1235 #, python-format
1236 msgid ""
1237 "There will not be any further Ubuntu releases for this system's POWER8 "
1238@@ -999,11 +1003,11 @@ msgid ""
1239 "Updates for Ubuntu %s will continue until %s."
1240 msgstr ""
1241
1242-#: ../DistUpgrade/DistUpgradeQuirks.py:414
1243+#: ../DistUpgrade/DistUpgradeQuirks.py:415
1244 msgid "No init available"
1245 msgstr ""
1246
1247-#: ../DistUpgrade/DistUpgradeQuirks.py:415
1248+#: ../DistUpgrade/DistUpgradeQuirks.py:416
1249 msgid ""
1250 "Your system appears to be a virtualised environment without an init daemon, "
1251 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
1252@@ -1013,11 +1017,11 @@ msgid ""
1253 "Are you sure you want to continue?"
1254 msgstr ""
1255
1256-#: ../DistUpgrade/DistUpgradeQuirks.py:456
1257+#: ../DistUpgrade/DistUpgradeQuirks.py:457
1258 msgid "The Robot Operating System (ROS) is installed"
1259 msgstr ""
1260
1261-#: ../DistUpgrade/DistUpgradeQuirks.py:457
1262+#: ../DistUpgrade/DistUpgradeQuirks.py:458
1263 msgid ""
1264 "It appears that ROS is currently installed. Each ROS release is very strict "
1265 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
1266@@ -1034,11 +1038,11 @@ msgid ""
1267 "Are you sure you want to continue?"
1268 msgstr ""
1269
1270-#: ../DistUpgrade/DistUpgradeQuirks.py:582
1271+#: ../DistUpgrade/DistUpgradeQuirks.py:583
1272 msgid "Connection to the Snap Store failed"
1273 msgstr ""
1274
1275-#: ../DistUpgrade/DistUpgradeQuirks.py:583
1276+#: ../DistUpgrade/DistUpgradeQuirks.py:584
1277 msgid ""
1278 "You have the package lxd installed but your system is unable to reach the "
1279 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
1280@@ -1048,11 +1052,11 @@ msgid ""
1281 "may want to configure a Snap Store proxy."
1282 msgstr ""
1283
1284-#: ../DistUpgrade/DistUpgradeQuirks.py:598
1285+#: ../DistUpgrade/DistUpgradeQuirks.py:599
1286 msgid "Connection to Snap Store failed"
1287 msgstr ""
1288
1289-#: ../DistUpgrade/DistUpgradeQuirks.py:599
1290+#: ../DistUpgrade/DistUpgradeQuirks.py:600
1291 msgid ""
1292 "Your system does not have a connection to the Snap Store. For the best "
1293 "upgrade experience make sure that your system can connect to api.snapcraft."
1294@@ -1060,11 +1064,11 @@ msgid ""
1295 "Do you still want to continue with the upgrade?"
1296 msgstr ""
1297
1298-#: ../DistUpgrade/DistUpgradeQuirks.py:608
1299+#: ../DistUpgrade/DistUpgradeQuirks.py:609
1300 msgid "Outdated snapd package"
1301 msgstr ""
1302
1303-#: ../DistUpgrade/DistUpgradeQuirks.py:609
1304+#: ../DistUpgrade/DistUpgradeQuirks.py:610
1305 msgid ""
1306 "Your system does not have the latest version of snapd. Please update the "
1307 "version of snapd on your system to improve the upgrade experience.\n"
1308@@ -1073,34 +1077,34 @@ msgstr ""
1309
1310 #. now perform direct API calls to the store, requesting size
1311 #. information for each of the snaps needing installation
1312-#: ../DistUpgrade/DistUpgradeQuirks.py:634
1313+#: ../DistUpgrade/DistUpgradeQuirks.py:635
1314 msgid "Calculating snap size requirements"
1315 msgstr ""
1316
1317-#: ../DistUpgrade/DistUpgradeQuirks.py:665
1318+#: ../DistUpgrade/DistUpgradeQuirks.py:666
1319 msgid "Processing snap replacements"
1320 msgstr ""
1321
1322-#: ../DistUpgrade/DistUpgradeQuirks.py:671
1323+#: ../DistUpgrade/DistUpgradeQuirks.py:672
1324 #, python-format
1325 msgid "refreshing snap %s"
1326 msgstr ""
1327
1328-#: ../DistUpgrade/DistUpgradeQuirks.py:675
1329+#: ../DistUpgrade/DistUpgradeQuirks.py:676
1330 #, python-format
1331 msgid "removing snap %s"
1332 msgstr ""
1333
1334-#: ../DistUpgrade/DistUpgradeQuirks.py:678
1335+#: ../DistUpgrade/DistUpgradeQuirks.py:679
1336 #, python-format
1337 msgid "installing snap %s"
1338 msgstr ""
1339
1340-#: ../DistUpgrade/DistUpgradeQuirks.py:707
1341+#: ../DistUpgrade/DistUpgradeQuirks.py:708
1342 msgid "PAE not enabled"
1343 msgstr ""
1344
1345-#: ../DistUpgrade/DistUpgradeQuirks.py:708
1346+#: ../DistUpgrade/DistUpgradeQuirks.py:709
1347 msgid ""
1348 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
1349 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
1350@@ -1108,11 +1112,11 @@ msgid ""
1351 "http://help.ubuntu.com/community/EnablingPAE"
1352 msgstr ""
1353
1354-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
1355+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
1356 msgid "universe component not enabled"
1357 msgstr ""
1358
1359-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
1360+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
1361 #, python-format
1362 msgid ""
1363 "You have the package %s installed which is a python2 package. python2 has "
1364@@ -1124,7 +1128,7 @@ msgid ""
1365 "universe component in /etc/apt/sources.list or remove %s"
1366 msgstr ""
1367
1368-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
1369+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
1370 msgid "Checking for installed snaps"
1371 msgstr ""
1372
1373diff --git a/po/ar.po b/po/ar.po
1374index d932145..1620789 100644
1375--- a/po/ar.po
1376+++ b/po/ar.po
1377@@ -10,7 +10,11 @@ msgid ""
1378 msgstr ""
1379 "Project-Id-Version: po_update-manager-ar\n"
1380 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
1381+<<<<<<< po/ar.po
1382 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
1383+=======
1384+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
1385+>>>>>>> po/ar.po
1386 "PO-Revision-Date: 2019-06-18 17:52+0000\n"
1387 "Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
1388 "Language-Team: Arabic\n"
1389@@ -1002,11 +1006,11 @@ msgstr "رجاء أدرج '%s' في محرك الأقراص '%s'"
1390 msgid "Media Change"
1391 msgstr "تغيير الوسائط"
1392
1393-#: ../DistUpgrade/DistUpgradeQuirks.py:235
1394+#: ../DistUpgrade/DistUpgradeQuirks.py:236
1395 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
1396 msgstr "قد يكون عتاد الرسوميات في جهازك ليس مدعوما بالكامل في أوبونتو 14.04."
1397
1398-#: ../DistUpgrade/DistUpgradeQuirks.py:237
1399+#: ../DistUpgrade/DistUpgradeQuirks.py:238
1400 msgid ""
1401 "Running the 'unity' desktop environment is not fully supported by your "
1402 "graphics hardware. You will maybe end up in a very slow environment after "
1403@@ -1021,11 +1025,11 @@ msgstr ""
1404 "Bugs/UpdateManagerWarningForUnity3D\r\n"
1405 "هل ما زلت ترغب بالاستمرار في الترقية؟"
1406
1407-#: ../DistUpgrade/DistUpgradeQuirks.py:261
1408+#: ../DistUpgrade/DistUpgradeQuirks.py:262
1409 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
1410 msgstr "قد يكون عتاد الرسوميات في جهازك غير مدعوم بالكامل في أوبنتو 12.04."
1411
1412-#: ../DistUpgrade/DistUpgradeQuirks.py:263
1413+#: ../DistUpgrade/DistUpgradeQuirks.py:264
1414 msgid ""
1415 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
1416 "and you may encounter problems after the upgrade. For more information see "
1417@@ -1036,7 +1040,7 @@ msgstr ""
1418 "لمزيد من المعلومات انظر: https://wiki.ubuntu.com/X/Bugs/"
1419 "UpdateManagerWarningForI8xx هل تود الاستمرار في الترقية؟"
1420
1421-#: ../DistUpgrade/DistUpgradeQuirks.py:283
1422+#: ../DistUpgrade/DistUpgradeQuirks.py:284
1423 msgid ""
1424 "Upgrading may reduce desktop effects, and performance in games and other "
1425 "graphically intensive programs."
1426@@ -1044,7 +1048,7 @@ msgstr ""
1427 "قد تقلل الترقية من تأثيرات سطح المكتب، وأداء الألعاب وبرامج الرسوميات "
1428 "المكثفة الأخرى."
1429
1430-#: ../DistUpgrade/DistUpgradeQuirks.py:287
1431+#: ../DistUpgrade/DistUpgradeQuirks.py:288
1432 msgid ""
1433 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
1434 "of this driver is available that works with your hardware in Ubuntu 10.04 "
1435@@ -1057,12 +1061,12 @@ msgstr ""
1436 "\n"
1437 "أتريد المواصلة؟"
1438
1439-#: ../DistUpgrade/DistUpgradeQuirks.py:326
1440-#: ../DistUpgrade/DistUpgradeQuirks.py:395
1441+#: ../DistUpgrade/DistUpgradeQuirks.py:327
1442+#: ../DistUpgrade/DistUpgradeQuirks.py:396
1443 msgid "Sorry, no more upgrades for this system"
1444 msgstr ""
1445
1446-#: ../DistUpgrade/DistUpgradeQuirks.py:327
1447+#: ../DistUpgrade/DistUpgradeQuirks.py:328
1448 #, python-format
1449 msgid ""
1450 "There will not be any further Ubuntu releases for this system's 'i386' "
1451@@ -1071,11 +1075,11 @@ msgid ""
1452 "Updates for Ubuntu %s will continue until %s."
1453 msgstr ""
1454
1455-#: ../DistUpgrade/DistUpgradeQuirks.py:342
1456+#: ../DistUpgrade/DistUpgradeQuirks.py:343
1457 msgid "No ARMv6 CPU"
1458 msgstr "لا معالج ARMv6"
1459
1460-#: ../DistUpgrade/DistUpgradeQuirks.py:343
1461+#: ../DistUpgrade/DistUpgradeQuirks.py:344
1462 msgid ""
1463 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
1464 "packages in karmic were built with optimizations requiring ARMv6 as the "
1465@@ -1086,12 +1090,12 @@ msgstr ""
1466 "مبنية لتعمل على الطراز ARMv6 كحد أدنى. من غير الممكن ترقية نظامك إلى إصدارة "
1467 "أوبونتو حديثة مع هذا العتاد."
1468
1469-#: ../DistUpgrade/DistUpgradeQuirks.py:363
1470+#: ../DistUpgrade/DistUpgradeQuirks.py:364
1471 msgid ""
1472 "Sorry, this storage driver is not supported in kernels for newer releases"
1473 msgstr ""
1474
1475-#: ../DistUpgrade/DistUpgradeQuirks.py:365
1476+#: ../DistUpgrade/DistUpgradeQuirks.py:366
1477 #, python-format
1478 msgid ""
1479 "There will not be any further Ubuntu releases that provide kernel support "
1480@@ -1101,7 +1105,7 @@ msgid ""
1481 "driver, remove the directory %s and try again."
1482 msgstr ""
1483
1484-#: ../DistUpgrade/DistUpgradeQuirks.py:396
1485+#: ../DistUpgrade/DistUpgradeQuirks.py:397
1486 #, python-format
1487 msgid ""
1488 "There will not be any further Ubuntu releases for this system's POWER8 "
1489@@ -1110,11 +1114,11 @@ msgid ""
1490 "Updates for Ubuntu %s will continue until %s."
1491 msgstr ""
1492
1493-#: ../DistUpgrade/DistUpgradeQuirks.py:414
1494+#: ../DistUpgrade/DistUpgradeQuirks.py:415
1495 msgid "No init available"
1496 msgstr "لا يوجد عفريت مدير للعمليات"
1497
1498-#: ../DistUpgrade/DistUpgradeQuirks.py:415
1499+#: ../DistUpgrade/DistUpgradeQuirks.py:416
1500 msgid ""
1501 "Your system appears to be a virtualised environment without an init daemon, "
1502 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
1503@@ -1129,11 +1133,11 @@ msgstr ""
1504 "\n"
1505 "هل حقاً تريد الاستمرار؟"
1506
1507-#: ../DistUpgrade/DistUpgradeQuirks.py:456
1508+#: ../DistUpgrade/DistUpgradeQuirks.py:457
1509 msgid "The Robot Operating System (ROS) is installed"
1510 msgstr ""
1511
1512-#: ../DistUpgrade/DistUpgradeQuirks.py:457
1513+#: ../DistUpgrade/DistUpgradeQuirks.py:458
1514 msgid ""
1515 "It appears that ROS is currently installed. Each ROS release is very strict "
1516 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
1517@@ -1150,11 +1154,11 @@ msgid ""
1518 "Are you sure you want to continue?"
1519 msgstr ""
1520
1521-#: ../DistUpgrade/DistUpgradeQuirks.py:582
1522+#: ../DistUpgrade/DistUpgradeQuirks.py:583
1523 msgid "Connection to the Snap Store failed"
1524 msgstr ""
1525
1526-#: ../DistUpgrade/DistUpgradeQuirks.py:583
1527+#: ../DistUpgrade/DistUpgradeQuirks.py:584
1528 msgid ""
1529 "You have the package lxd installed but your system is unable to reach the "
1530 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
1531@@ -1164,11 +1168,11 @@ msgid ""
1532 "may want to configure a Snap Store proxy."
1533 msgstr ""
1534
1535-#: ../DistUpgrade/DistUpgradeQuirks.py:598
1536+#: ../DistUpgrade/DistUpgradeQuirks.py:599
1537 msgid "Connection to Snap Store failed"
1538 msgstr ""
1539
1540-#: ../DistUpgrade/DistUpgradeQuirks.py:599
1541+#: ../DistUpgrade/DistUpgradeQuirks.py:600
1542 msgid ""
1543 "Your system does not have a connection to the Snap Store. For the best "
1544 "upgrade experience make sure that your system can connect to api.snapcraft."
1545@@ -1176,11 +1180,11 @@ msgid ""
1546 "Do you still want to continue with the upgrade?"
1547 msgstr ""
1548
1549-#: ../DistUpgrade/DistUpgradeQuirks.py:608
1550+#: ../DistUpgrade/DistUpgradeQuirks.py:609
1551 msgid "Outdated snapd package"
1552 msgstr ""
1553
1554-#: ../DistUpgrade/DistUpgradeQuirks.py:609
1555+#: ../DistUpgrade/DistUpgradeQuirks.py:610
1556 msgid ""
1557 "Your system does not have the latest version of snapd. Please update the "
1558 "version of snapd on your system to improve the upgrade experience.\n"
1559@@ -1189,34 +1193,34 @@ msgstr ""
1560
1561 #. now perform direct API calls to the store, requesting size
1562 #. information for each of the snaps needing installation
1563-#: ../DistUpgrade/DistUpgradeQuirks.py:634
1564+#: ../DistUpgrade/DistUpgradeQuirks.py:635
1565 msgid "Calculating snap size requirements"
1566 msgstr ""
1567
1568-#: ../DistUpgrade/DistUpgradeQuirks.py:665
1569+#: ../DistUpgrade/DistUpgradeQuirks.py:666
1570 msgid "Processing snap replacements"
1571 msgstr ""
1572
1573-#: ../DistUpgrade/DistUpgradeQuirks.py:671
1574+#: ../DistUpgrade/DistUpgradeQuirks.py:672
1575 #, python-format
1576 msgid "refreshing snap %s"
1577 msgstr ""
1578
1579-#: ../DistUpgrade/DistUpgradeQuirks.py:675
1580+#: ../DistUpgrade/DistUpgradeQuirks.py:676
1581 #, python-format
1582 msgid "removing snap %s"
1583 msgstr ""
1584
1585-#: ../DistUpgrade/DistUpgradeQuirks.py:678
1586+#: ../DistUpgrade/DistUpgradeQuirks.py:679
1587 #, python-format
1588 msgid "installing snap %s"
1589 msgstr ""
1590
1591-#: ../DistUpgrade/DistUpgradeQuirks.py:707
1592+#: ../DistUpgrade/DistUpgradeQuirks.py:708
1593 msgid "PAE not enabled"
1594 msgstr ""
1595
1596-#: ../DistUpgrade/DistUpgradeQuirks.py:708
1597+#: ../DistUpgrade/DistUpgradeQuirks.py:709
1598 msgid ""
1599 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
1600 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
1601@@ -1224,11 +1228,11 @@ msgid ""
1602 "http://help.ubuntu.com/community/EnablingPAE"
1603 msgstr ""
1604
1605-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
1606+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
1607 msgid "universe component not enabled"
1608 msgstr ""
1609
1610-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
1611+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
1612 #, python-format
1613 msgid ""
1614 "You have the package %s installed which is a python2 package. python2 has "
1615@@ -1240,7 +1244,7 @@ msgid ""
1616 "universe component in /etc/apt/sources.list or remove %s"
1617 msgstr ""
1618
1619-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
1620+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
1621 msgid "Checking for installed snaps"
1622 msgstr ""
1623
1624diff --git a/po/ast.po b/po/ast.po
1625index 0cab776..bde6d54 100644
1626--- a/po/ast.po
1627+++ b/po/ast.po
1628@@ -8,7 +8,11 @@ msgid ""
1629 msgstr ""
1630 "Project-Id-Version: update-manager\n"
1631 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
1632+<<<<<<< po/ast.po
1633 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
1634+=======
1635+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
1636+>>>>>>> po/ast.po
1637 "PO-Revision-Date: 2019-06-18 17:54+0000\n"
1638 "Last-Translator: ivarela <ivarela@ubuntu.com>\n"
1639 "Language-Team: Asturian <ast@li.org>\n"
1640@@ -996,12 +1000,12 @@ msgstr "Por favor, inserta '%s' nel dispositivu '%s'"
1641 msgid "Media Change"
1642 msgstr "Cambéu de preséu"
1643
1644-#: ../DistUpgrade/DistUpgradeQuirks.py:235
1645+#: ../DistUpgrade/DistUpgradeQuirks.py:236
1646 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
1647 msgstr ""
1648 "Pue que'l so hardware gráficu nun tenga sofitu completu n'Ubuntu 14.04."
1649
1650-#: ../DistUpgrade/DistUpgradeQuirks.py:237
1651+#: ../DistUpgrade/DistUpgradeQuirks.py:238
1652 msgid ""
1653 "Running the 'unity' desktop environment is not fully supported by your "
1654 "graphics hardware. You will maybe end up in a very slow environment after "
1655@@ -1016,12 +1020,12 @@ msgstr ""
1656 "obtener más información, consulta https://wiki.ubuntu.com/X/Bugs/"
1657 "UpdateManagerWarningForUnity3D ¿Aínda quies siguir col anovamientu?"
1658
1659-#: ../DistUpgrade/DistUpgradeQuirks.py:261
1660+#: ../DistUpgrade/DistUpgradeQuirks.py:262
1661 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
1662 msgstr ""
1663 "El hardware de gráficos nun ye compatible dafechu con Ubuntu 12.04 LTS."
1664
1665-#: ../DistUpgrade/DistUpgradeQuirks.py:263
1666+#: ../DistUpgrade/DistUpgradeQuirks.py:264
1667 msgid ""
1668 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
1669 "and you may encounter problems after the upgrade. For more information see "
1670@@ -1033,7 +1037,7 @@ msgstr ""
1671 "información llei https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx "
1672 "¿Quies siguir col anovamientu?"
1673
1674-#: ../DistUpgrade/DistUpgradeQuirks.py:283
1675+#: ../DistUpgrade/DistUpgradeQuirks.py:284
1676 msgid ""
1677 "Upgrading may reduce desktop effects, and performance in games and other "
1678 "graphically intensive programs."
1679@@ -1042,7 +1046,7 @@ msgstr ""
1680 "rendimientu de los xuegos y otros programes qu'usen gráficos de mou "
1681 "intensivu."
1682
1683-#: ../DistUpgrade/DistUpgradeQuirks.py:287
1684+#: ../DistUpgrade/DistUpgradeQuirks.py:288
1685 msgid ""
1686 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
1687 "of this driver is available that works with your hardware in Ubuntu 10.04 "
1688@@ -1056,12 +1060,12 @@ msgstr ""
1689 "\n"
1690 "¿Quier continuar?"
1691
1692-#: ../DistUpgrade/DistUpgradeQuirks.py:326
1693-#: ../DistUpgrade/DistUpgradeQuirks.py:395
1694+#: ../DistUpgrade/DistUpgradeQuirks.py:327
1695+#: ../DistUpgrade/DistUpgradeQuirks.py:396
1696 msgid "Sorry, no more upgrades for this system"
1697 msgstr ""
1698
1699-#: ../DistUpgrade/DistUpgradeQuirks.py:327
1700+#: ../DistUpgrade/DistUpgradeQuirks.py:328
1701 #, python-format
1702 msgid ""
1703 "There will not be any further Ubuntu releases for this system's 'i386' "
1704@@ -1070,11 +1074,11 @@ msgid ""
1705 "Updates for Ubuntu %s will continue until %s."
1706 msgstr ""
1707
1708-#: ../DistUpgrade/DistUpgradeQuirks.py:342
1709+#: ../DistUpgrade/DistUpgradeQuirks.py:343
1710 msgid "No ARMv6 CPU"
1711 msgstr "No ARMv6 CPU"
1712
1713-#: ../DistUpgrade/DistUpgradeQuirks.py:343
1714+#: ../DistUpgrade/DistUpgradeQuirks.py:344
1715 msgid ""
1716 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
1717 "packages in karmic were built with optimizations requiring ARMv6 as the "
1718@@ -1086,12 +1090,12 @@ msgstr ""
1719 "ARMv6 como arquiteutura mínima. Nun ye dable anovar el so sistema a la nueva "
1720 "versión d'Ubuntu con esti hardware."
1721
1722-#: ../DistUpgrade/DistUpgradeQuirks.py:363
1723+#: ../DistUpgrade/DistUpgradeQuirks.py:364
1724 msgid ""
1725 "Sorry, this storage driver is not supported in kernels for newer releases"
1726 msgstr ""
1727
1728-#: ../DistUpgrade/DistUpgradeQuirks.py:365
1729+#: ../DistUpgrade/DistUpgradeQuirks.py:366
1730 #, python-format
1731 msgid ""
1732 "There will not be any further Ubuntu releases that provide kernel support "
1733@@ -1101,7 +1105,7 @@ msgid ""
1734 "driver, remove the directory %s and try again."
1735 msgstr ""
1736
1737-#: ../DistUpgrade/DistUpgradeQuirks.py:396
1738+#: ../DistUpgrade/DistUpgradeQuirks.py:397
1739 #, python-format
1740 msgid ""
1741 "There will not be any further Ubuntu releases for this system's POWER8 "
1742@@ -1110,11 +1114,11 @@ msgid ""
1743 "Updates for Ubuntu %s will continue until %s."
1744 msgstr ""
1745
1746-#: ../DistUpgrade/DistUpgradeQuirks.py:414
1747+#: ../DistUpgrade/DistUpgradeQuirks.py:415
1748 msgid "No init available"
1749 msgstr "El degorriu init nun ta disponible"
1750
1751-#: ../DistUpgrade/DistUpgradeQuirks.py:415
1752+#: ../DistUpgrade/DistUpgradeQuirks.py:416
1753 msgid ""
1754 "Your system appears to be a virtualised environment without an init daemon, "
1755 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
1756@@ -1130,11 +1134,11 @@ msgstr ""
1757 "\n"
1758 "¿Daveres que quies siguir?"
1759
1760-#: ../DistUpgrade/DistUpgradeQuirks.py:456
1761+#: ../DistUpgrade/DistUpgradeQuirks.py:457
1762 msgid "The Robot Operating System (ROS) is installed"
1763 msgstr ""
1764
1765-#: ../DistUpgrade/DistUpgradeQuirks.py:457
1766+#: ../DistUpgrade/DistUpgradeQuirks.py:458
1767 msgid ""
1768 "It appears that ROS is currently installed. Each ROS release is very strict "
1769 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
1770@@ -1151,11 +1155,11 @@ msgid ""
1771 "Are you sure you want to continue?"
1772 msgstr ""
1773
1774-#: ../DistUpgrade/DistUpgradeQuirks.py:582
1775+#: ../DistUpgrade/DistUpgradeQuirks.py:583
1776 msgid "Connection to the Snap Store failed"
1777 msgstr ""
1778
1779-#: ../DistUpgrade/DistUpgradeQuirks.py:583
1780+#: ../DistUpgrade/DistUpgradeQuirks.py:584
1781 msgid ""
1782 "You have the package lxd installed but your system is unable to reach the "
1783 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
1784@@ -1165,11 +1169,11 @@ msgid ""
1785 "may want to configure a Snap Store proxy."
1786 msgstr ""
1787
1788-#: ../DistUpgrade/DistUpgradeQuirks.py:598
1789+#: ../DistUpgrade/DistUpgradeQuirks.py:599
1790 msgid "Connection to Snap Store failed"
1791 msgstr ""
1792
1793-#: ../DistUpgrade/DistUpgradeQuirks.py:599
1794+#: ../DistUpgrade/DistUpgradeQuirks.py:600
1795 msgid ""
1796 "Your system does not have a connection to the Snap Store. For the best "
1797 "upgrade experience make sure that your system can connect to api.snapcraft."
1798@@ -1177,11 +1181,11 @@ msgid ""
1799 "Do you still want to continue with the upgrade?"
1800 msgstr ""
1801
1802-#: ../DistUpgrade/DistUpgradeQuirks.py:608
1803+#: ../DistUpgrade/DistUpgradeQuirks.py:609
1804 msgid "Outdated snapd package"
1805 msgstr ""
1806
1807-#: ../DistUpgrade/DistUpgradeQuirks.py:609
1808+#: ../DistUpgrade/DistUpgradeQuirks.py:610
1809 msgid ""
1810 "Your system does not have the latest version of snapd. Please update the "
1811 "version of snapd on your system to improve the upgrade experience.\n"
1812@@ -1190,34 +1194,34 @@ msgstr ""
1813
1814 #. now perform direct API calls to the store, requesting size
1815 #. information for each of the snaps needing installation
1816-#: ../DistUpgrade/DistUpgradeQuirks.py:634
1817+#: ../DistUpgrade/DistUpgradeQuirks.py:635
1818 msgid "Calculating snap size requirements"
1819 msgstr ""
1820
1821-#: ../DistUpgrade/DistUpgradeQuirks.py:665
1822+#: ../DistUpgrade/DistUpgradeQuirks.py:666
1823 msgid "Processing snap replacements"
1824 msgstr ""
1825
1826-#: ../DistUpgrade/DistUpgradeQuirks.py:671
1827+#: ../DistUpgrade/DistUpgradeQuirks.py:672
1828 #, python-format
1829 msgid "refreshing snap %s"
1830 msgstr ""
1831
1832-#: ../DistUpgrade/DistUpgradeQuirks.py:675
1833+#: ../DistUpgrade/DistUpgradeQuirks.py:676
1834 #, python-format
1835 msgid "removing snap %s"
1836 msgstr ""
1837
1838-#: ../DistUpgrade/DistUpgradeQuirks.py:678
1839+#: ../DistUpgrade/DistUpgradeQuirks.py:679
1840 #, python-format
1841 msgid "installing snap %s"
1842 msgstr ""
1843
1844-#: ../DistUpgrade/DistUpgradeQuirks.py:707
1845+#: ../DistUpgrade/DistUpgradeQuirks.py:708
1846 msgid "PAE not enabled"
1847 msgstr "PAE nun ta activáu"
1848
1849-#: ../DistUpgrade/DistUpgradeQuirks.py:708
1850+#: ../DistUpgrade/DistUpgradeQuirks.py:709
1851 msgid ""
1852 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
1853 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
1854@@ -1229,11 +1233,11 @@ msgstr ""
1855 "más reciente d'Ubuntu, tien d'activar PAE (si ye posible) vea:\n"
1856 " http://help.ubuntu.com/community/EnablingPAE"
1857
1858-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
1859+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
1860 msgid "universe component not enabled"
1861 msgstr ""
1862
1863-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
1864+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
1865 #, python-format
1866 msgid ""
1867 "You have the package %s installed which is a python2 package. python2 has "
1868@@ -1245,7 +1249,7 @@ msgid ""
1869 "universe component in /etc/apt/sources.list or remove %s"
1870 msgstr ""
1871
1872-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
1873+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
1874 msgid "Checking for installed snaps"
1875 msgstr ""
1876
1877diff --git a/po/az.po b/po/az.po
1878index 4676ab0..7e7e021 100644
1879--- a/po/az.po
1880+++ b/po/az.po
1881@@ -8,7 +8,11 @@ msgid ""
1882 msgstr ""
1883 "Project-Id-Version: update-manager\n"
1884 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
1885+<<<<<<< po/az.po
1886 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
1887+=======
1888+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
1889+>>>>>>> po/az.po
1890 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
1891 "Last-Translator: Emin Mastizadeh <emin25@ovi.com>\n"
1892 "Language-Team: Azerbaijani <az@li.org>\n"
1893@@ -893,11 +897,11 @@ msgstr "Xaiş olunur '%s' mənbəyini '%s' sürücüsünə yerləşdirin"
1894 msgid "Media Change"
1895 msgstr ""
1896
1897-#: ../DistUpgrade/DistUpgradeQuirks.py:235
1898+#: ../DistUpgrade/DistUpgradeQuirks.py:236
1899 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
1900 msgstr ""
1901
1902-#: ../DistUpgrade/DistUpgradeQuirks.py:237
1903+#: ../DistUpgrade/DistUpgradeQuirks.py:238
1904 msgid ""
1905 "Running the 'unity' desktop environment is not fully supported by your "
1906 "graphics hardware. You will maybe end up in a very slow environment after "
1907@@ -907,11 +911,11 @@ msgid ""
1908 "upgrade?"
1909 msgstr ""
1910
1911-#: ../DistUpgrade/DistUpgradeQuirks.py:261
1912+#: ../DistUpgrade/DistUpgradeQuirks.py:262
1913 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
1914 msgstr ""
1915
1916-#: ../DistUpgrade/DistUpgradeQuirks.py:263
1917+#: ../DistUpgrade/DistUpgradeQuirks.py:264
1918 msgid ""
1919 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
1920 "and you may encounter problems after the upgrade. For more information see "
1921@@ -919,13 +923,13 @@ msgid ""
1922 "continue with the upgrade?"
1923 msgstr ""
1924
1925-#: ../DistUpgrade/DistUpgradeQuirks.py:283
1926+#: ../DistUpgrade/DistUpgradeQuirks.py:284
1927 msgid ""
1928 "Upgrading may reduce desktop effects, and performance in games and other "
1929 "graphically intensive programs."
1930 msgstr ""
1931
1932-#: ../DistUpgrade/DistUpgradeQuirks.py:287
1933+#: ../DistUpgrade/DistUpgradeQuirks.py:288
1934 msgid ""
1935 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
1936 "of this driver is available that works with your hardware in Ubuntu 10.04 "
1937@@ -934,12 +938,12 @@ msgid ""
1938 "Do you want to continue?"
1939 msgstr ""
1940
1941-#: ../DistUpgrade/DistUpgradeQuirks.py:326
1942-#: ../DistUpgrade/DistUpgradeQuirks.py:395
1943+#: ../DistUpgrade/DistUpgradeQuirks.py:327
1944+#: ../DistUpgrade/DistUpgradeQuirks.py:396
1945 msgid "Sorry, no more upgrades for this system"
1946 msgstr ""
1947
1948-#: ../DistUpgrade/DistUpgradeQuirks.py:327
1949+#: ../DistUpgrade/DistUpgradeQuirks.py:328
1950 #, python-format
1951 msgid ""
1952 "There will not be any further Ubuntu releases for this system's 'i386' "
1953@@ -948,11 +952,11 @@ msgid ""
1954 "Updates for Ubuntu %s will continue until %s."
1955 msgstr ""
1956
1957-#: ../DistUpgrade/DistUpgradeQuirks.py:342
1958+#: ../DistUpgrade/DistUpgradeQuirks.py:343
1959 msgid "No ARMv6 CPU"
1960 msgstr ""
1961
1962-#: ../DistUpgrade/DistUpgradeQuirks.py:343
1963+#: ../DistUpgrade/DistUpgradeQuirks.py:344
1964 msgid ""
1965 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
1966 "packages in karmic were built with optimizations requiring ARMv6 as the "
1967@@ -960,12 +964,12 @@ msgid ""
1968 "Ubuntu release with this hardware."
1969 msgstr ""
1970
1971-#: ../DistUpgrade/DistUpgradeQuirks.py:363
1972+#: ../DistUpgrade/DistUpgradeQuirks.py:364
1973 msgid ""
1974 "Sorry, this storage driver is not supported in kernels for newer releases"
1975 msgstr ""
1976
1977-#: ../DistUpgrade/DistUpgradeQuirks.py:365
1978+#: ../DistUpgrade/DistUpgradeQuirks.py:366
1979 #, python-format
1980 msgid ""
1981 "There will not be any further Ubuntu releases that provide kernel support "
1982@@ -975,7 +979,7 @@ msgid ""
1983 "driver, remove the directory %s and try again."
1984 msgstr ""
1985
1986-#: ../DistUpgrade/DistUpgradeQuirks.py:396
1987+#: ../DistUpgrade/DistUpgradeQuirks.py:397
1988 #, python-format
1989 msgid ""
1990 "There will not be any further Ubuntu releases for this system's POWER8 "
1991@@ -984,11 +988,11 @@ msgid ""
1992 "Updates for Ubuntu %s will continue until %s."
1993 msgstr ""
1994
1995-#: ../DistUpgrade/DistUpgradeQuirks.py:414
1996+#: ../DistUpgrade/DistUpgradeQuirks.py:415
1997 msgid "No init available"
1998 msgstr ""
1999
2000-#: ../DistUpgrade/DistUpgradeQuirks.py:415
2001+#: ../DistUpgrade/DistUpgradeQuirks.py:416
2002 msgid ""
2003 "Your system appears to be a virtualised environment without an init daemon, "
2004 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
2005@@ -998,11 +1002,11 @@ msgid ""
2006 "Are you sure you want to continue?"
2007 msgstr ""
2008
2009-#: ../DistUpgrade/DistUpgradeQuirks.py:456
2010+#: ../DistUpgrade/DistUpgradeQuirks.py:457
2011 msgid "The Robot Operating System (ROS) is installed"
2012 msgstr ""
2013
2014-#: ../DistUpgrade/DistUpgradeQuirks.py:457
2015+#: ../DistUpgrade/DistUpgradeQuirks.py:458
2016 msgid ""
2017 "It appears that ROS is currently installed. Each ROS release is very strict "
2018 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
2019@@ -1019,11 +1023,11 @@ msgid ""
2020 "Are you sure you want to continue?"
2021 msgstr ""
2022
2023-#: ../DistUpgrade/DistUpgradeQuirks.py:582
2024+#: ../DistUpgrade/DistUpgradeQuirks.py:583
2025 msgid "Connection to the Snap Store failed"
2026 msgstr ""
2027
2028-#: ../DistUpgrade/DistUpgradeQuirks.py:583
2029+#: ../DistUpgrade/DistUpgradeQuirks.py:584
2030 msgid ""
2031 "You have the package lxd installed but your system is unable to reach the "
2032 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
2033@@ -1033,11 +1037,11 @@ msgid ""
2034 "may want to configure a Snap Store proxy."
2035 msgstr ""
2036
2037-#: ../DistUpgrade/DistUpgradeQuirks.py:598
2038+#: ../DistUpgrade/DistUpgradeQuirks.py:599
2039 msgid "Connection to Snap Store failed"
2040 msgstr ""
2041
2042-#: ../DistUpgrade/DistUpgradeQuirks.py:599
2043+#: ../DistUpgrade/DistUpgradeQuirks.py:600
2044 msgid ""
2045 "Your system does not have a connection to the Snap Store. For the best "
2046 "upgrade experience make sure that your system can connect to api.snapcraft."
2047@@ -1045,11 +1049,11 @@ msgid ""
2048 "Do you still want to continue with the upgrade?"
2049 msgstr ""
2050
2051-#: ../DistUpgrade/DistUpgradeQuirks.py:608
2052+#: ../DistUpgrade/DistUpgradeQuirks.py:609
2053 msgid "Outdated snapd package"
2054 msgstr ""
2055
2056-#: ../DistUpgrade/DistUpgradeQuirks.py:609
2057+#: ../DistUpgrade/DistUpgradeQuirks.py:610
2058 msgid ""
2059 "Your system does not have the latest version of snapd. Please update the "
2060 "version of snapd on your system to improve the upgrade experience.\n"
2061@@ -1058,34 +1062,34 @@ msgstr ""
2062
2063 #. now perform direct API calls to the store, requesting size
2064 #. information for each of the snaps needing installation
2065-#: ../DistUpgrade/DistUpgradeQuirks.py:634
2066+#: ../DistUpgrade/DistUpgradeQuirks.py:635
2067 msgid "Calculating snap size requirements"
2068 msgstr ""
2069
2070-#: ../DistUpgrade/DistUpgradeQuirks.py:665
2071+#: ../DistUpgrade/DistUpgradeQuirks.py:666
2072 msgid "Processing snap replacements"
2073 msgstr ""
2074
2075-#: ../DistUpgrade/DistUpgradeQuirks.py:671
2076+#: ../DistUpgrade/DistUpgradeQuirks.py:672
2077 #, python-format
2078 msgid "refreshing snap %s"
2079 msgstr ""
2080
2081-#: ../DistUpgrade/DistUpgradeQuirks.py:675
2082+#: ../DistUpgrade/DistUpgradeQuirks.py:676
2083 #, python-format
2084 msgid "removing snap %s"
2085 msgstr ""
2086
2087-#: ../DistUpgrade/DistUpgradeQuirks.py:678
2088+#: ../DistUpgrade/DistUpgradeQuirks.py:679
2089 #, python-format
2090 msgid "installing snap %s"
2091 msgstr ""
2092
2093-#: ../DistUpgrade/DistUpgradeQuirks.py:707
2094+#: ../DistUpgrade/DistUpgradeQuirks.py:708
2095 msgid "PAE not enabled"
2096 msgstr ""
2097
2098-#: ../DistUpgrade/DistUpgradeQuirks.py:708
2099+#: ../DistUpgrade/DistUpgradeQuirks.py:709
2100 msgid ""
2101 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
2102 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
2103@@ -1093,11 +1097,11 @@ msgid ""
2104 "http://help.ubuntu.com/community/EnablingPAE"
2105 msgstr ""
2106
2107-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
2108+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
2109 msgid "universe component not enabled"
2110 msgstr ""
2111
2112-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
2113+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
2114 #, python-format
2115 msgid ""
2116 "You have the package %s installed which is a python2 package. python2 has "
2117@@ -1109,7 +1113,7 @@ msgid ""
2118 "universe component in /etc/apt/sources.list or remove %s"
2119 msgstr ""
2120
2121-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
2122+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
2123 msgid "Checking for installed snaps"
2124 msgstr ""
2125
2126diff --git a/po/be.po b/po/be.po
2127index d1db71f..44f1020 100644
2128--- a/po/be.po
2129+++ b/po/be.po
2130@@ -8,7 +8,11 @@ msgid ""
2131 msgstr ""
2132 "Project-Id-Version: update-manager\n"
2133 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
2134+<<<<<<< po/be.po
2135 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
2136+=======
2137+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
2138+>>>>>>> po/be.po
2139 "PO-Revision-Date: 2019-06-18 17:54+0000\n"
2140 "Last-Translator: Brian Murray <brian@ubuntu.com>\n"
2141 "Language-Team: Belarusian <be@li.org>\n"
2142@@ -1002,12 +1006,12 @@ msgstr "Калі ласка, устаўце \"%s\" у прыладу \"%s\""
2143 msgid "Media Change"
2144 msgstr "Змена носьбіта"
2145
2146-#: ../DistUpgrade/DistUpgradeQuirks.py:235
2147+#: ../DistUpgrade/DistUpgradeQuirks.py:236
2148 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
2149 msgstr ""
2150 "Ваша графічнае абсталяванне не можа быць цалкам падтрыманым ў Ubuntu 14.04."
2151
2152-#: ../DistUpgrade/DistUpgradeQuirks.py:237
2153+#: ../DistUpgrade/DistUpgradeQuirks.py:238
2154 msgid ""
2155 "Running the 'unity' desktop environment is not fully supported by your "
2156 "graphics hardware. You will maybe end up in a very slow environment after "
2157@@ -1022,13 +1026,13 @@ msgstr ""
2158 "звесткі гл. https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForUnity3D Вы "
2159 "ўсё яшчэ хочаце працягнуць абнаўленне?"
2160
2161-#: ../DistUpgrade/DistUpgradeQuirks.py:261
2162+#: ../DistUpgrade/DistUpgradeQuirks.py:262
2163 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
2164 msgstr ""
2165 "Вашае графічнае абсталяванне, магчыма, не будзе падтрымлівацца цалкам у "
2166 "Ubuntu 12.04 LTS"
2167
2168-#: ../DistUpgrade/DistUpgradeQuirks.py:263
2169+#: ../DistUpgrade/DistUpgradeQuirks.py:264
2170 msgid ""
2171 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
2172 "and you may encounter problems after the upgrade. For more information see "
2173@@ -1040,7 +1044,7 @@ msgstr ""
2174 "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx \r\n"
2175 "Вы сапраўды хочаце працягнуць абнаўленне?"
2176
2177-#: ../DistUpgrade/DistUpgradeQuirks.py:283
2178+#: ../DistUpgrade/DistUpgradeQuirks.py:284
2179 msgid ""
2180 "Upgrading may reduce desktop effects, and performance in games and other "
2181 "graphically intensive programs."
2182@@ -1048,7 +1052,7 @@ msgstr ""
2183 "Абнаўленне можа выклікаць зніжэнне якасці эфектаў працоўнага стала і "
2184 "прадукцыйнасці ў гульнях і праграмах, што актыўна выкарыстоўваюць графіку."
2185
2186-#: ../DistUpgrade/DistUpgradeQuirks.py:287
2187+#: ../DistUpgrade/DistUpgradeQuirks.py:288
2188 msgid ""
2189 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
2190 "of this driver is available that works with your hardware in Ubuntu 10.04 "
2191@@ -1062,12 +1066,12 @@ msgstr ""
2192 "\n"
2193 "Працягнуць?"
2194
2195-#: ../DistUpgrade/DistUpgradeQuirks.py:326
2196-#: ../DistUpgrade/DistUpgradeQuirks.py:395
2197+#: ../DistUpgrade/DistUpgradeQuirks.py:327
2198+#: ../DistUpgrade/DistUpgradeQuirks.py:396
2199 msgid "Sorry, no more upgrades for this system"
2200 msgstr ""
2201
2202-#: ../DistUpgrade/DistUpgradeQuirks.py:327
2203+#: ../DistUpgrade/DistUpgradeQuirks.py:328
2204 #, python-format
2205 msgid ""
2206 "There will not be any further Ubuntu releases for this system's 'i386' "
2207@@ -1076,11 +1080,11 @@ msgid ""
2208 "Updates for Ubuntu %s will continue until %s."
2209 msgstr ""
2210
2211-#: ../DistUpgrade/DistUpgradeQuirks.py:342
2212+#: ../DistUpgrade/DistUpgradeQuirks.py:343
2213 msgid "No ARMv6 CPU"
2214 msgstr "Няма працэсара ARMv6"
2215
2216-#: ../DistUpgrade/DistUpgradeQuirks.py:343
2217+#: ../DistUpgrade/DistUpgradeQuirks.py:344
2218 msgid ""
2219 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
2220 "packages in karmic were built with optimizations requiring ARMv6 as the "
2221@@ -1092,12 +1096,12 @@ msgstr ""
2222 "ARMv6 і вышэй. Вашу сістэму немагчыма абнавіць да новага рэлізу Ubuntu з "
2223 "бягучым апаратным забеспячэннем."
2224
2225-#: ../DistUpgrade/DistUpgradeQuirks.py:363
2226+#: ../DistUpgrade/DistUpgradeQuirks.py:364
2227 msgid ""
2228 "Sorry, this storage driver is not supported in kernels for newer releases"
2229 msgstr ""
2230
2231-#: ../DistUpgrade/DistUpgradeQuirks.py:365
2232+#: ../DistUpgrade/DistUpgradeQuirks.py:366
2233 #, python-format
2234 msgid ""
2235 "There will not be any further Ubuntu releases that provide kernel support "
2236@@ -1107,7 +1111,7 @@ msgid ""
2237 "driver, remove the directory %s and try again."
2238 msgstr ""
2239
2240-#: ../DistUpgrade/DistUpgradeQuirks.py:396
2241+#: ../DistUpgrade/DistUpgradeQuirks.py:397
2242 #, python-format
2243 msgid ""
2244 "There will not be any further Ubuntu releases for this system's POWER8 "
2245@@ -1116,11 +1120,11 @@ msgid ""
2246 "Updates for Ubuntu %s will continue until %s."
2247 msgstr ""
2248
2249-#: ../DistUpgrade/DistUpgradeQuirks.py:414
2250+#: ../DistUpgrade/DistUpgradeQuirks.py:415
2251 msgid "No init available"
2252 msgstr "Служба init недаступна"
2253
2254-#: ../DistUpgrade/DistUpgradeQuirks.py:415
2255+#: ../DistUpgrade/DistUpgradeQuirks.py:416
2256 msgid ""
2257 "Your system appears to be a virtualised environment without an init daemon, "
2258 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
2259@@ -1134,11 +1138,11 @@ msgstr ""
2260 "\n"
2261 "Вы ўпэўнены, што хочаце працягнуць?"
2262
2263-#: ../DistUpgrade/DistUpgradeQuirks.py:456
2264+#: ../DistUpgrade/DistUpgradeQuirks.py:457
2265 msgid "The Robot Operating System (ROS) is installed"
2266 msgstr ""
2267
2268-#: ../DistUpgrade/DistUpgradeQuirks.py:457
2269+#: ../DistUpgrade/DistUpgradeQuirks.py:458
2270 msgid ""
2271 "It appears that ROS is currently installed. Each ROS release is very strict "
2272 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
2273@@ -1155,11 +1159,11 @@ msgid ""
2274 "Are you sure you want to continue?"
2275 msgstr ""
2276
2277-#: ../DistUpgrade/DistUpgradeQuirks.py:582
2278+#: ../DistUpgrade/DistUpgradeQuirks.py:583
2279 msgid "Connection to the Snap Store failed"
2280 msgstr ""
2281
2282-#: ../DistUpgrade/DistUpgradeQuirks.py:583
2283+#: ../DistUpgrade/DistUpgradeQuirks.py:584
2284 msgid ""
2285 "You have the package lxd installed but your system is unable to reach the "
2286 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
2287@@ -1169,11 +1173,11 @@ msgid ""
2288 "may want to configure a Snap Store proxy."
2289 msgstr ""
2290
2291-#: ../DistUpgrade/DistUpgradeQuirks.py:598
2292+#: ../DistUpgrade/DistUpgradeQuirks.py:599
2293 msgid "Connection to Snap Store failed"
2294 msgstr ""
2295
2296-#: ../DistUpgrade/DistUpgradeQuirks.py:599
2297+#: ../DistUpgrade/DistUpgradeQuirks.py:600
2298 msgid ""
2299 "Your system does not have a connection to the Snap Store. For the best "
2300 "upgrade experience make sure that your system can connect to api.snapcraft."
2301@@ -1181,11 +1185,11 @@ msgid ""
2302 "Do you still want to continue with the upgrade?"
2303 msgstr ""
2304
2305-#: ../DistUpgrade/DistUpgradeQuirks.py:608
2306+#: ../DistUpgrade/DistUpgradeQuirks.py:609
2307 msgid "Outdated snapd package"
2308 msgstr ""
2309
2310-#: ../DistUpgrade/DistUpgradeQuirks.py:609
2311+#: ../DistUpgrade/DistUpgradeQuirks.py:610
2312 msgid ""
2313 "Your system does not have the latest version of snapd. Please update the "
2314 "version of snapd on your system to improve the upgrade experience.\n"
2315@@ -1194,34 +1198,34 @@ msgstr ""
2316
2317 #. now perform direct API calls to the store, requesting size
2318 #. information for each of the snaps needing installation
2319-#: ../DistUpgrade/DistUpgradeQuirks.py:634
2320+#: ../DistUpgrade/DistUpgradeQuirks.py:635
2321 msgid "Calculating snap size requirements"
2322 msgstr ""
2323
2324-#: ../DistUpgrade/DistUpgradeQuirks.py:665
2325+#: ../DistUpgrade/DistUpgradeQuirks.py:666
2326 msgid "Processing snap replacements"
2327 msgstr ""
2328
2329-#: ../DistUpgrade/DistUpgradeQuirks.py:671
2330+#: ../DistUpgrade/DistUpgradeQuirks.py:672
2331 #, python-format
2332 msgid "refreshing snap %s"
2333 msgstr ""
2334
2335-#: ../DistUpgrade/DistUpgradeQuirks.py:675
2336+#: ../DistUpgrade/DistUpgradeQuirks.py:676
2337 #, python-format
2338 msgid "removing snap %s"
2339 msgstr ""
2340
2341-#: ../DistUpgrade/DistUpgradeQuirks.py:678
2342+#: ../DistUpgrade/DistUpgradeQuirks.py:679
2343 #, python-format
2344 msgid "installing snap %s"
2345 msgstr ""
2346
2347-#: ../DistUpgrade/DistUpgradeQuirks.py:707
2348+#: ../DistUpgrade/DistUpgradeQuirks.py:708
2349 msgid "PAE not enabled"
2350 msgstr "PAE не ўключана"
2351
2352-#: ../DistUpgrade/DistUpgradeQuirks.py:708
2353+#: ../DistUpgrade/DistUpgradeQuirks.py:709
2354 msgid ""
2355 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
2356 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
2357@@ -1233,11 +1237,11 @@ msgstr ""
2358 "12.10. Абнаўленне да новай версіі Ubuntu запатрабуе ўключэння PAE (калі гэта "
2359 "магчыма). Гл.: Http://help.ubuntu.com/community/EnablingPAE"
2360
2361-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
2362+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
2363 msgid "universe component not enabled"
2364 msgstr ""
2365
2366-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
2367+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
2368 #, python-format
2369 msgid ""
2370 "You have the package %s installed which is a python2 package. python2 has "
2371@@ -1249,7 +1253,7 @@ msgid ""
2372 "universe component in /etc/apt/sources.list or remove %s"
2373 msgstr ""
2374
2375-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
2376+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
2377 msgid "Checking for installed snaps"
2378 msgstr ""
2379
2380diff --git a/po/bg.po b/po/bg.po
2381index 1c3d400..d9bf05d 100644
2382--- a/po/bg.po
2383+++ b/po/bg.po
2384@@ -9,7 +9,11 @@ msgid ""
2385 msgstr ""
2386 "Project-Id-Version: update manager\n"
2387 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
2388+<<<<<<< po/bg.po
2389 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
2390+=======
2391+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
2392+>>>>>>> po/bg.po
2393 "PO-Revision-Date: 2019-06-18 17:55+0000\n"
2394 "Last-Translator: Brian Murray <brian@ubuntu.com>\n"
2395 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
2396@@ -996,12 +1000,12 @@ msgstr "Моля, поставете диск «%s» в устройство «%
2397 msgid "Media Change"
2398 msgstr "Смяна на носител"
2399
2400-#: ../DistUpgrade/DistUpgradeQuirks.py:235
2401+#: ../DistUpgrade/DistUpgradeQuirks.py:236
2402 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
2403 msgstr ""
2404 "Вашият графичен хардуер не може да бъде напълно поддържан в Убунту 14.04."
2405
2406-#: ../DistUpgrade/DistUpgradeQuirks.py:237
2407+#: ../DistUpgrade/DistUpgradeQuirks.py:238
2408 msgid ""
2409 "Running the 'unity' desktop environment is not fully supported by your "
2410 "graphics hardware. You will maybe end up in a very slow environment after "
2411@@ -1016,12 +1020,12 @@ msgstr ""
2412 "посетете https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForUnity3D. Все "
2413 "още ли искате да започнете с надграждането?"
2414
2415-#: ../DistUpgrade/DistUpgradeQuirks.py:261
2416+#: ../DistUpgrade/DistUpgradeQuirks.py:262
2417 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
2418 msgstr ""
2419 "Вашият графичен хардуер може да не се поддържа напълно в Убунту 12.04 LTS."
2420
2421-#: ../DistUpgrade/DistUpgradeQuirks.py:263
2422+#: ../DistUpgrade/DistUpgradeQuirks.py:264
2423 msgid ""
2424 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
2425 "and you may encounter problems after the upgrade. For more information see "
2426@@ -1033,7 +1037,7 @@ msgstr ""
2427 "информация вижте https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx. "
2428 "Искате ли да продължите с надграждането?"
2429
2430-#: ../DistUpgrade/DistUpgradeQuirks.py:283
2431+#: ../DistUpgrade/DistUpgradeQuirks.py:284
2432 msgid ""
2433 "Upgrading may reduce desktop effects, and performance in games and other "
2434 "graphically intensive programs."
2435@@ -1041,7 +1045,7 @@ msgstr ""
2436 "Надграждането може да намали ефектите на работния плот и производителността "
2437 "в игрите и други графични програми."
2438
2439-#: ../DistUpgrade/DistUpgradeQuirks.py:287
2440+#: ../DistUpgrade/DistUpgradeQuirks.py:288
2441 msgid ""
2442 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
2443 "of this driver is available that works with your hardware in Ubuntu 10.04 "
2444@@ -1054,12 +1058,12 @@ msgstr ""
2445 "\n"
2446 "Искате ли да продължите?"
2447
2448-#: ../DistUpgrade/DistUpgradeQuirks.py:326
2449-#: ../DistUpgrade/DistUpgradeQuirks.py:395
2450+#: ../DistUpgrade/DistUpgradeQuirks.py:327
2451+#: ../DistUpgrade/DistUpgradeQuirks.py:396
2452 msgid "Sorry, no more upgrades for this system"
2453 msgstr ""
2454
2455-#: ../DistUpgrade/DistUpgradeQuirks.py:327
2456+#: ../DistUpgrade/DistUpgradeQuirks.py:328
2457 #, python-format
2458 msgid ""
2459 "There will not be any further Ubuntu releases for this system's 'i386' "
2460@@ -1068,11 +1072,11 @@ msgid ""
2461 "Updates for Ubuntu %s will continue until %s."
2462 msgstr ""
2463
2464-#: ../DistUpgrade/DistUpgradeQuirks.py:342
2465+#: ../DistUpgrade/DistUpgradeQuirks.py:343
2466 msgid "No ARMv6 CPU"
2467 msgstr "Няма ARMv6 процесор"
2468
2469-#: ../DistUpgrade/DistUpgradeQuirks.py:343
2470+#: ../DistUpgrade/DistUpgradeQuirks.py:344
2471 msgid ""
2472 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
2473 "packages in karmic were built with optimizations requiring ARMv6 as the "
2474@@ -1083,12 +1087,12 @@ msgstr ""
2475 "пакети в Karmic бяха оптимизрани с изискване минимум ARMv6 архитектура. Не е "
2476 "възможно да надградите система си до ново издание на Убунту с този хардуер."
2477
2478-#: ../DistUpgrade/DistUpgradeQuirks.py:363
2479+#: ../DistUpgrade/DistUpgradeQuirks.py:364
2480 msgid ""
2481 "Sorry, this storage driver is not supported in kernels for newer releases"
2482 msgstr ""
2483
2484-#: ../DistUpgrade/DistUpgradeQuirks.py:365
2485+#: ../DistUpgrade/DistUpgradeQuirks.py:366
2486 #, python-format
2487 msgid ""
2488 "There will not be any further Ubuntu releases that provide kernel support "
2489@@ -1098,7 +1102,7 @@ msgid ""
2490 "driver, remove the directory %s and try again."
2491 msgstr ""
2492
2493-#: ../DistUpgrade/DistUpgradeQuirks.py:396
2494+#: ../DistUpgrade/DistUpgradeQuirks.py:397
2495 #, python-format
2496 msgid ""
2497 "There will not be any further Ubuntu releases for this system's POWER8 "
2498@@ -1107,11 +1111,11 @@ msgid ""
2499 "Updates for Ubuntu %s will continue until %s."
2500 msgstr ""
2501
2502-#: ../DistUpgrade/DistUpgradeQuirks.py:414
2503+#: ../DistUpgrade/DistUpgradeQuirks.py:415
2504 msgid "No init available"
2505 msgstr "Няма достъпен init"
2506
2507-#: ../DistUpgrade/DistUpgradeQuirks.py:415
2508+#: ../DistUpgrade/DistUpgradeQuirks.py:416
2509 msgid ""
2510 "Your system appears to be a virtualised environment without an init daemon, "
2511 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
2512@@ -1125,11 +1129,11 @@ msgstr ""
2513 "изисква се, актуализиране на настройката на виртуалната ви машина.\n"
2514 "Сигурни ли сте, че искате да продължите?"
2515
2516-#: ../DistUpgrade/DistUpgradeQuirks.py:456
2517+#: ../DistUpgrade/DistUpgradeQuirks.py:457
2518 msgid "The Robot Operating System (ROS) is installed"
2519 msgstr ""
2520
2521-#: ../DistUpgrade/DistUpgradeQuirks.py:457
2522+#: ../DistUpgrade/DistUpgradeQuirks.py:458
2523 msgid ""
2524 "It appears that ROS is currently installed. Each ROS release is very strict "
2525 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
2526@@ -1146,11 +1150,11 @@ msgid ""
2527 "Are you sure you want to continue?"
2528 msgstr ""
2529
2530-#: ../DistUpgrade/DistUpgradeQuirks.py:582
2531+#: ../DistUpgrade/DistUpgradeQuirks.py:583
2532 msgid "Connection to the Snap Store failed"
2533 msgstr ""
2534
2535-#: ../DistUpgrade/DistUpgradeQuirks.py:583
2536+#: ../DistUpgrade/DistUpgradeQuirks.py:584
2537 msgid ""
2538 "You have the package lxd installed but your system is unable to reach the "
2539 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
2540@@ -1160,11 +1164,11 @@ msgid ""
2541 "may want to configure a Snap Store proxy."
2542 msgstr ""
2543
2544-#: ../DistUpgrade/DistUpgradeQuirks.py:598
2545+#: ../DistUpgrade/DistUpgradeQuirks.py:599
2546 msgid "Connection to Snap Store failed"
2547 msgstr ""
2548
2549-#: ../DistUpgrade/DistUpgradeQuirks.py:599
2550+#: ../DistUpgrade/DistUpgradeQuirks.py:600
2551 msgid ""
2552 "Your system does not have a connection to the Snap Store. For the best "
2553 "upgrade experience make sure that your system can connect to api.snapcraft."
2554@@ -1172,11 +1176,11 @@ msgid ""
2555 "Do you still want to continue with the upgrade?"
2556 msgstr ""
2557
2558-#: ../DistUpgrade/DistUpgradeQuirks.py:608
2559+#: ../DistUpgrade/DistUpgradeQuirks.py:609
2560 msgid "Outdated snapd package"
2561 msgstr ""
2562
2563-#: ../DistUpgrade/DistUpgradeQuirks.py:609
2564+#: ../DistUpgrade/DistUpgradeQuirks.py:610
2565 msgid ""
2566 "Your system does not have the latest version of snapd. Please update the "
2567 "version of snapd on your system to improve the upgrade experience.\n"
2568@@ -1185,34 +1189,34 @@ msgstr ""
2569
2570 #. now perform direct API calls to the store, requesting size
2571 #. information for each of the snaps needing installation
2572-#: ../DistUpgrade/DistUpgradeQuirks.py:634
2573+#: ../DistUpgrade/DistUpgradeQuirks.py:635
2574 msgid "Calculating snap size requirements"
2575 msgstr ""
2576
2577-#: ../DistUpgrade/DistUpgradeQuirks.py:665
2578+#: ../DistUpgrade/DistUpgradeQuirks.py:666
2579 msgid "Processing snap replacements"
2580 msgstr ""
2581
2582-#: ../DistUpgrade/DistUpgradeQuirks.py:671
2583+#: ../DistUpgrade/DistUpgradeQuirks.py:672
2584 #, python-format
2585 msgid "refreshing snap %s"
2586 msgstr ""
2587
2588-#: ../DistUpgrade/DistUpgradeQuirks.py:675
2589+#: ../DistUpgrade/DistUpgradeQuirks.py:676
2590 #, python-format
2591 msgid "removing snap %s"
2592 msgstr ""
2593
2594-#: ../DistUpgrade/DistUpgradeQuirks.py:678
2595+#: ../DistUpgrade/DistUpgradeQuirks.py:679
2596 #, python-format
2597 msgid "installing snap %s"
2598 msgstr ""
2599
2600-#: ../DistUpgrade/DistUpgradeQuirks.py:707
2601+#: ../DistUpgrade/DistUpgradeQuirks.py:708
2602 msgid "PAE not enabled"
2603 msgstr "PAE е изключен"
2604
2605-#: ../DistUpgrade/DistUpgradeQuirks.py:708
2606+#: ../DistUpgrade/DistUpgradeQuirks.py:709
2607 msgid ""
2608 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
2609 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
2610@@ -1220,11 +1224,11 @@ msgid ""
2611 "http://help.ubuntu.com/community/EnablingPAE"
2612 msgstr ""
2613
2614-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
2615+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
2616 msgid "universe component not enabled"
2617 msgstr ""
2618
2619-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
2620+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
2621 #, python-format
2622 msgid ""
2623 "You have the package %s installed which is a python2 package. python2 has "
2624@@ -1236,7 +1240,7 @@ msgid ""
2625 "universe component in /etc/apt/sources.list or remove %s"
2626 msgstr ""
2627
2628-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
2629+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
2630 msgid "Checking for installed snaps"
2631 msgstr ""
2632
2633diff --git a/po/bn.po b/po/bn.po
2634index e1215aa..2012201 100644
2635--- a/po/bn.po
2636+++ b/po/bn.po
2637@@ -12,7 +12,11 @@ msgid ""
2638 msgstr ""
2639 "Project-Id-Version: shotwell-0.7.2\n"
2640 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
2641+<<<<<<< po/bn.po
2642 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
2643+=======
2644+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
2645+>>>>>>> po/bn.po
2646 "PO-Revision-Date: 2019-02-10 12:11+0000\n"
2647 "Last-Translator: Istiak Ferdous <Unknown>\n"
2648 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
2649@@ -984,11 +988,11 @@ msgstr "দয়া করে '%s' ড্রাইভে '%s' প্রবেশ
2650 msgid "Media Change"
2651 msgstr "মিডিয়া পরিবর্তন"
2652
2653-#: ../DistUpgrade/DistUpgradeQuirks.py:235
2654+#: ../DistUpgrade/DistUpgradeQuirks.py:236
2655 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
2656 msgstr ""
2657
2658-#: ../DistUpgrade/DistUpgradeQuirks.py:237
2659+#: ../DistUpgrade/DistUpgradeQuirks.py:238
2660 msgid ""
2661 "Running the 'unity' desktop environment is not fully supported by your "
2662 "graphics hardware. You will maybe end up in a very slow environment after "
2663@@ -998,12 +1002,12 @@ msgid ""
2664 "upgrade?"
2665 msgstr ""
2666
2667-#: ../DistUpgrade/DistUpgradeQuirks.py:261
2668+#: ../DistUpgrade/DistUpgradeQuirks.py:262
2669 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
2670 msgstr ""
2671 "আপনার গ্রাফিক্স হার্ডওয়্যার উবুন্টু ১২.০৪ (LTS) এ সম্ভবত পুরোপুরি ভাবে সমর্থন করবে না।"
2672
2673-#: ../DistUpgrade/DistUpgradeQuirks.py:263
2674+#: ../DistUpgrade/DistUpgradeQuirks.py:264
2675 msgid ""
2676 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
2677 "and you may encounter problems after the upgrade. For more information see "
2678@@ -1015,7 +1019,7 @@ msgstr ""
2679 "Bugs/UpdateManagerWarningForI8xx আপনি কি উন্নীতকরণ করতে চান?"
2680
2681 # snigdha
2682-#: ../DistUpgrade/DistUpgradeQuirks.py:283
2683+#: ../DistUpgrade/DistUpgradeQuirks.py:284
2684 msgid ""
2685 "Upgrading may reduce desktop effects, and performance in games and other "
2686 "graphically intensive programs."
2687@@ -1023,7 +1027,7 @@ msgstr ""
2688 "আপগ্রেড করার ফলে গ্রাফিক ভিত্তিক প্রোগ্রাম ও গেমস্ ব্যবহার করার সময় ডেক্সটপের প্রভাব "
2689 "ও কার্যকারীতা কিছুটা কমে যাবে।"
2690
2691-#: ../DistUpgrade/DistUpgradeQuirks.py:287
2692+#: ../DistUpgrade/DistUpgradeQuirks.py:288
2693 msgid ""
2694 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
2695 "of this driver is available that works with your hardware in Ubuntu 10.04 "
2696@@ -1036,12 +1040,12 @@ msgstr ""
2697 "\n"
2698 " আপনি কি চালিয়ে যেতে চান?"
2699
2700-#: ../DistUpgrade/DistUpgradeQuirks.py:326
2701-#: ../DistUpgrade/DistUpgradeQuirks.py:395
2702+#: ../DistUpgrade/DistUpgradeQuirks.py:327
2703+#: ../DistUpgrade/DistUpgradeQuirks.py:396
2704 msgid "Sorry, no more upgrades for this system"
2705 msgstr ""
2706
2707-#: ../DistUpgrade/DistUpgradeQuirks.py:327
2708+#: ../DistUpgrade/DistUpgradeQuirks.py:328
2709 #, python-format
2710 msgid ""
2711 "There will not be any further Ubuntu releases for this system's 'i386' "
2712@@ -1050,11 +1054,11 @@ msgid ""
2713 "Updates for Ubuntu %s will continue until %s."
2714 msgstr ""
2715
2716-#: ../DistUpgrade/DistUpgradeQuirks.py:342
2717+#: ../DistUpgrade/DistUpgradeQuirks.py:343
2718 msgid "No ARMv6 CPU"
2719 msgstr "কোনো ARMv6 CPU নেই"
2720
2721-#: ../DistUpgrade/DistUpgradeQuirks.py:343
2722+#: ../DistUpgrade/DistUpgradeQuirks.py:344
2723 msgid ""
2724 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
2725 "packages in karmic were built with optimizations requiring ARMv6 as the "
2726@@ -1065,12 +1069,12 @@ msgstr ""
2727 "সব প্যাকেজ সর্বনিম্ন ARMv6 আর্কিটেকচারে নির্মাণ করা হয়েছে। এই হার্ডওয়্যার সহকারে "
2728 "আপনার সিস্টেমকে নতুন উবুন্টু সংস্করণে আপগ্রেড করা সম্ভব নয়।"
2729
2730-#: ../DistUpgrade/DistUpgradeQuirks.py:363
2731+#: ../DistUpgrade/DistUpgradeQuirks.py:364
2732 msgid ""
2733 "Sorry, this storage driver is not supported in kernels for newer releases"
2734 msgstr ""
2735
2736-#: ../DistUpgrade/DistUpgradeQuirks.py:365
2737+#: ../DistUpgrade/DistUpgradeQuirks.py:366
2738 #, python-format
2739 msgid ""
2740 "There will not be any further Ubuntu releases that provide kernel support "
2741@@ -1080,7 +1084,7 @@ msgid ""
2742 "driver, remove the directory %s and try again."
2743 msgstr ""
2744
2745-#: ../DistUpgrade/DistUpgradeQuirks.py:396
2746+#: ../DistUpgrade/DistUpgradeQuirks.py:397
2747 #, python-format
2748 msgid ""
2749 "There will not be any further Ubuntu releases for this system's POWER8 "
2750@@ -1089,11 +1093,11 @@ msgid ""
2751 "Updates for Ubuntu %s will continue until %s."
2752 msgstr ""
2753
2754-#: ../DistUpgrade/DistUpgradeQuirks.py:414
2755+#: ../DistUpgrade/DistUpgradeQuirks.py:415
2756 msgid "No init available"
2757 msgstr "কোনো init নেই"
2758
2759-#: ../DistUpgrade/DistUpgradeQuirks.py:415
2760+#: ../DistUpgrade/DistUpgradeQuirks.py:416
2761 msgid ""
2762 "Your system appears to be a virtualised environment without an init daemon, "
2763 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
2764@@ -1108,11 +1112,11 @@ msgstr ""
2765 "\n"
2766 "আপনি কি নিশ্চিত আপনি এগিয়ে যেতে চান?"
2767
2768-#: ../DistUpgrade/DistUpgradeQuirks.py:456
2769+#: ../DistUpgrade/DistUpgradeQuirks.py:457
2770 msgid "The Robot Operating System (ROS) is installed"
2771 msgstr ""
2772
2773-#: ../DistUpgrade/DistUpgradeQuirks.py:457
2774+#: ../DistUpgrade/DistUpgradeQuirks.py:458
2775 msgid ""
2776 "It appears that ROS is currently installed. Each ROS release is very strict "
2777 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
2778@@ -1129,11 +1133,11 @@ msgid ""
2779 "Are you sure you want to continue?"
2780 msgstr ""
2781
2782-#: ../DistUpgrade/DistUpgradeQuirks.py:582
2783+#: ../DistUpgrade/DistUpgradeQuirks.py:583
2784 msgid "Connection to the Snap Store failed"
2785 msgstr ""
2786
2787-#: ../DistUpgrade/DistUpgradeQuirks.py:583
2788+#: ../DistUpgrade/DistUpgradeQuirks.py:584
2789 msgid ""
2790 "You have the package lxd installed but your system is unable to reach the "
2791 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
2792@@ -1143,11 +1147,11 @@ msgid ""
2793 "may want to configure a Snap Store proxy."
2794 msgstr ""
2795
2796-#: ../DistUpgrade/DistUpgradeQuirks.py:598
2797+#: ../DistUpgrade/DistUpgradeQuirks.py:599
2798 msgid "Connection to Snap Store failed"
2799 msgstr ""
2800
2801-#: ../DistUpgrade/DistUpgradeQuirks.py:599
2802+#: ../DistUpgrade/DistUpgradeQuirks.py:600
2803 msgid ""
2804 "Your system does not have a connection to the Snap Store. For the best "
2805 "upgrade experience make sure that your system can connect to api.snapcraft."
2806@@ -1155,11 +1159,11 @@ msgid ""
2807 "Do you still want to continue with the upgrade?"
2808 msgstr ""
2809
2810-#: ../DistUpgrade/DistUpgradeQuirks.py:608
2811+#: ../DistUpgrade/DistUpgradeQuirks.py:609
2812 msgid "Outdated snapd package"
2813 msgstr ""
2814
2815-#: ../DistUpgrade/DistUpgradeQuirks.py:609
2816+#: ../DistUpgrade/DistUpgradeQuirks.py:610
2817 msgid ""
2818 "Your system does not have the latest version of snapd. Please update the "
2819 "version of snapd on your system to improve the upgrade experience.\n"
2820@@ -1168,34 +1172,34 @@ msgstr ""
2821
2822 #. now perform direct API calls to the store, requesting size
2823 #. information for each of the snaps needing installation
2824-#: ../DistUpgrade/DistUpgradeQuirks.py:634
2825+#: ../DistUpgrade/DistUpgradeQuirks.py:635
2826 msgid "Calculating snap size requirements"
2827 msgstr ""
2828
2829-#: ../DistUpgrade/DistUpgradeQuirks.py:665
2830+#: ../DistUpgrade/DistUpgradeQuirks.py:666
2831 msgid "Processing snap replacements"
2832 msgstr ""
2833
2834-#: ../DistUpgrade/DistUpgradeQuirks.py:671
2835+#: ../DistUpgrade/DistUpgradeQuirks.py:672
2836 #, python-format
2837 msgid "refreshing snap %s"
2838 msgstr ""
2839
2840-#: ../DistUpgrade/DistUpgradeQuirks.py:675
2841+#: ../DistUpgrade/DistUpgradeQuirks.py:676
2842 #, python-format
2843 msgid "removing snap %s"
2844 msgstr ""
2845
2846-#: ../DistUpgrade/DistUpgradeQuirks.py:678
2847+#: ../DistUpgrade/DistUpgradeQuirks.py:679
2848 #, python-format
2849 msgid "installing snap %s"
2850 msgstr ""
2851
2852-#: ../DistUpgrade/DistUpgradeQuirks.py:707
2853+#: ../DistUpgrade/DistUpgradeQuirks.py:708
2854 msgid "PAE not enabled"
2855 msgstr "PAE সক্রিয় নয়"
2856
2857-#: ../DistUpgrade/DistUpgradeQuirks.py:708
2858+#: ../DistUpgrade/DistUpgradeQuirks.py:709
2859 msgid ""
2860 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
2861 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
2862@@ -1203,11 +1207,11 @@ msgid ""
2863 "http://help.ubuntu.com/community/EnablingPAE"
2864 msgstr ""
2865
2866-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
2867+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
2868 msgid "universe component not enabled"
2869 msgstr ""
2870
2871-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
2872+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
2873 #, python-format
2874 msgid ""
2875 "You have the package %s installed which is a python2 package. python2 has "
2876@@ -1219,7 +1223,7 @@ msgid ""
2877 "universe component in /etc/apt/sources.list or remove %s"
2878 msgstr ""
2879
2880-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
2881+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
2882 msgid "Checking for installed snaps"
2883 msgstr ""
2884
2885diff --git a/po/bo.po b/po/bo.po
2886index 4e85d98..976852a 100644
2887--- a/po/bo.po
2888+++ b/po/bo.po
2889@@ -8,7 +8,11 @@ msgid ""
2890 msgstr ""
2891 "Project-Id-Version: update-manager\n"
2892 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
2893+<<<<<<< po/bo.po
2894 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
2895+=======
2896+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
2897+>>>>>>> po/bo.po
2898 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
2899 "Last-Translator: Brian Murray <brian@ubuntu.com>\n"
2900 "Language-Team: Tibetan <bo@li.org>\n"
2901@@ -919,11 +923,11 @@ msgstr "སྒུལ་ཆས་'%2s'ནང་དུ་'%1s'འཇུག་ར
2902 msgid "Media Change"
2903 msgstr "འཇུག་ཟམ་བརྗེ་བ"
2904
2905-#: ../DistUpgrade/DistUpgradeQuirks.py:235
2906+#: ../DistUpgrade/DistUpgradeQuirks.py:236
2907 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
2908 msgstr ""
2909
2910-#: ../DistUpgrade/DistUpgradeQuirks.py:237
2911+#: ../DistUpgrade/DistUpgradeQuirks.py:238
2912 msgid ""
2913 "Running the 'unity' desktop environment is not fully supported by your "
2914 "graphics hardware. You will maybe end up in a very slow environment after "
2915@@ -933,11 +937,11 @@ msgid ""
2916 "upgrade?"
2917 msgstr ""
2918
2919-#: ../DistUpgrade/DistUpgradeQuirks.py:261
2920+#: ../DistUpgrade/DistUpgradeQuirks.py:262
2921 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
2922 msgstr ""
2923
2924-#: ../DistUpgrade/DistUpgradeQuirks.py:263
2925+#: ../DistUpgrade/DistUpgradeQuirks.py:264
2926 msgid ""
2927 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
2928 "and you may encounter problems after the upgrade. For more information see "
2929@@ -945,7 +949,7 @@ msgid ""
2930 "continue with the upgrade?"
2931 msgstr ""
2932
2933-#: ../DistUpgrade/DistUpgradeQuirks.py:283
2934+#: ../DistUpgrade/DistUpgradeQuirks.py:284
2935 msgid ""
2936 "Upgrading may reduce desktop effects, and performance in games and other "
2937 "graphically intensive programs."
2938@@ -953,7 +957,7 @@ msgstr ""
2939 "རིམ་སྤོར་གྱིས་མདུན་ངོས་ཀྱི་རྣམ་པ་དང་རྩེད་རིགས་ཀྱི་འགྲོ་སྟངས། པར་རིས་མང་པོ་ཡོད་པའི་བྱ་རིམ་ལ་འགྱུར་ལྡོག་ཡོད་"
2940 "ཉེན་ཆེཨ"
2941
2942-#: ../DistUpgrade/DistUpgradeQuirks.py:287
2943+#: ../DistUpgrade/DistUpgradeQuirks.py:288
2944 msgid ""
2945 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
2946 "of this driver is available that works with your hardware in Ubuntu 10.04 "
2947@@ -966,12 +970,12 @@ msgstr ""
2948 "\n"
2949 "ཁྱོད་ཀྱིས་མུ་མཐུད་དགོས་སམ"
2950
2951-#: ../DistUpgrade/DistUpgradeQuirks.py:326
2952-#: ../DistUpgrade/DistUpgradeQuirks.py:395
2953+#: ../DistUpgrade/DistUpgradeQuirks.py:327
2954+#: ../DistUpgrade/DistUpgradeQuirks.py:396
2955 msgid "Sorry, no more upgrades for this system"
2956 msgstr ""
2957
2958-#: ../DistUpgrade/DistUpgradeQuirks.py:327
2959+#: ../DistUpgrade/DistUpgradeQuirks.py:328
2960 #, python-format
2961 msgid ""
2962 "There will not be any further Ubuntu releases for this system's 'i386' "
2963@@ -980,11 +984,11 @@ msgid ""
2964 "Updates for Ubuntu %s will continue until %s."
2965 msgstr ""
2966
2967-#: ../DistUpgrade/DistUpgradeQuirks.py:342
2968+#: ../DistUpgrade/DistUpgradeQuirks.py:343
2969 msgid "No ARMv6 CPU"
2970 msgstr "ARMv6 CPU་མེད་པ"
2971
2972-#: ../DistUpgrade/DistUpgradeQuirks.py:343
2973+#: ../DistUpgrade/DistUpgradeQuirks.py:344
2974 msgid ""
2975 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
2976 "packages in karmic were built with optimizations requiring ARMv6 as the "
2977@@ -996,12 +1000,12 @@ msgstr ""
2978 "minimal architecture. It is not possible to upgrade your system to a new "
2979 "Ubuntu release with this hardware."
2980
2981-#: ../DistUpgrade/DistUpgradeQuirks.py:363
2982+#: ../DistUpgrade/DistUpgradeQuirks.py:364
2983 msgid ""
2984 "Sorry, this storage driver is not supported in kernels for newer releases"
2985 msgstr ""
2986
2987-#: ../DistUpgrade/DistUpgradeQuirks.py:365
2988+#: ../DistUpgrade/DistUpgradeQuirks.py:366
2989 #, python-format
2990 msgid ""
2991 "There will not be any further Ubuntu releases that provide kernel support "
2992@@ -1011,7 +1015,7 @@ msgid ""
2993 "driver, remove the directory %s and try again."
2994 msgstr ""
2995
2996-#: ../DistUpgrade/DistUpgradeQuirks.py:396
2997+#: ../DistUpgrade/DistUpgradeQuirks.py:397
2998 #, python-format
2999 msgid ""
3000 "There will not be any further Ubuntu releases for this system's POWER8 "
3001@@ -1020,11 +1024,11 @@ msgid ""
3002 "Updates for Ubuntu %s will continue until %s."
3003 msgstr ""
3004
3005-#: ../DistUpgrade/DistUpgradeQuirks.py:414
3006+#: ../DistUpgrade/DistUpgradeQuirks.py:415
3007 msgid "No init available"
3008 msgstr "init ་མེད་པ"
3009
3010-#: ../DistUpgrade/DistUpgradeQuirks.py:415
3011+#: ../DistUpgrade/DistUpgradeQuirks.py:416
3012 msgid ""
3013 "Your system appears to be a virtualised environment without an init daemon, "
3014 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
3015@@ -1040,11 +1044,11 @@ msgstr ""
3016 "\n"
3017 "Are you sure you want to continue?"
3018
3019-#: ../DistUpgrade/DistUpgradeQuirks.py:456
3020+#: ../DistUpgrade/DistUpgradeQuirks.py:457
3021 msgid "The Robot Operating System (ROS) is installed"
3022 msgstr ""
3023
3024-#: ../DistUpgrade/DistUpgradeQuirks.py:457
3025+#: ../DistUpgrade/DistUpgradeQuirks.py:458
3026 msgid ""
3027 "It appears that ROS is currently installed. Each ROS release is very strict "
3028 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
3029@@ -1061,11 +1065,11 @@ msgid ""
3030 "Are you sure you want to continue?"
3031 msgstr ""
3032
3033-#: ../DistUpgrade/DistUpgradeQuirks.py:582
3034+#: ../DistUpgrade/DistUpgradeQuirks.py:583
3035 msgid "Connection to the Snap Store failed"
3036 msgstr ""
3037
3038-#: ../DistUpgrade/DistUpgradeQuirks.py:583
3039+#: ../DistUpgrade/DistUpgradeQuirks.py:584
3040 msgid ""
3041 "You have the package lxd installed but your system is unable to reach the "
3042 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
3043@@ -1075,11 +1079,11 @@ msgid ""
3044 "may want to configure a Snap Store proxy."
3045 msgstr ""
3046
3047-#: ../DistUpgrade/DistUpgradeQuirks.py:598
3048+#: ../DistUpgrade/DistUpgradeQuirks.py:599
3049 msgid "Connection to Snap Store failed"
3050 msgstr ""
3051
3052-#: ../DistUpgrade/DistUpgradeQuirks.py:599
3053+#: ../DistUpgrade/DistUpgradeQuirks.py:600
3054 msgid ""
3055 "Your system does not have a connection to the Snap Store. For the best "
3056 "upgrade experience make sure that your system can connect to api.snapcraft."
3057@@ -1087,11 +1091,11 @@ msgid ""
3058 "Do you still want to continue with the upgrade?"
3059 msgstr ""
3060
3061-#: ../DistUpgrade/DistUpgradeQuirks.py:608
3062+#: ../DistUpgrade/DistUpgradeQuirks.py:609
3063 msgid "Outdated snapd package"
3064 msgstr ""
3065
3066-#: ../DistUpgrade/DistUpgradeQuirks.py:609
3067+#: ../DistUpgrade/DistUpgradeQuirks.py:610
3068 msgid ""
3069 "Your system does not have the latest version of snapd. Please update the "
3070 "version of snapd on your system to improve the upgrade experience.\n"
3071@@ -1100,34 +1104,34 @@ msgstr ""
3072
3073 #. now perform direct API calls to the store, requesting size
3074 #. information for each of the snaps needing installation
3075-#: ../DistUpgrade/DistUpgradeQuirks.py:634
3076+#: ../DistUpgrade/DistUpgradeQuirks.py:635
3077 msgid "Calculating snap size requirements"
3078 msgstr ""
3079
3080-#: ../DistUpgrade/DistUpgradeQuirks.py:665
3081+#: ../DistUpgrade/DistUpgradeQuirks.py:666
3082 msgid "Processing snap replacements"
3083 msgstr ""
3084
3085-#: ../DistUpgrade/DistUpgradeQuirks.py:671
3086+#: ../DistUpgrade/DistUpgradeQuirks.py:672
3087 #, python-format
3088 msgid "refreshing snap %s"
3089 msgstr ""
3090
3091-#: ../DistUpgrade/DistUpgradeQuirks.py:675
3092+#: ../DistUpgrade/DistUpgradeQuirks.py:676
3093 #, python-format
3094 msgid "removing snap %s"
3095 msgstr ""
3096
3097-#: ../DistUpgrade/DistUpgradeQuirks.py:678
3098+#: ../DistUpgrade/DistUpgradeQuirks.py:679
3099 #, python-format
3100 msgid "installing snap %s"
3101 msgstr ""
3102
3103-#: ../DistUpgrade/DistUpgradeQuirks.py:707
3104+#: ../DistUpgrade/DistUpgradeQuirks.py:708
3105 msgid "PAE not enabled"
3106 msgstr ""
3107
3108-#: ../DistUpgrade/DistUpgradeQuirks.py:708
3109+#: ../DistUpgrade/DistUpgradeQuirks.py:709
3110 msgid ""
3111 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
3112 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
3113@@ -1135,11 +1139,11 @@ msgid ""
3114 "http://help.ubuntu.com/community/EnablingPAE"
3115 msgstr ""
3116
3117-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
3118+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
3119 msgid "universe component not enabled"
3120 msgstr ""
3121
3122-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
3123+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
3124 #, python-format
3125 msgid ""
3126 "You have the package %s installed which is a python2 package. python2 has "
3127@@ -1151,7 +1155,7 @@ msgid ""
3128 "universe component in /etc/apt/sources.list or remove %s"
3129 msgstr ""
3130
3131-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
3132+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
3133 msgid "Checking for installed snaps"
3134 msgstr ""
3135
3136diff --git a/po/br.po b/po/br.po
3137index c616b5e..d87936b 100644
3138--- a/po/br.po
3139+++ b/po/br.po
3140@@ -8,7 +8,11 @@ msgid ""
3141 msgstr ""
3142 "Project-Id-Version: update-manager\n"
3143 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
3144+<<<<<<< po/br.po
3145 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
3146+=======
3147+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
3148+>>>>>>> po/br.po
3149 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
3150 "Last-Translator: Brian Murray <brian@ubuntu.com>\n"
3151 "Language-Team: Breton <br@li.org>\n"
3152@@ -940,11 +944,11 @@ msgstr "Mar plij, enlakait '%s' el lenner '%s'"
3153 msgid "Media Change"
3154 msgstr "Kemm ar media"
3155
3156-#: ../DistUpgrade/DistUpgradeQuirks.py:235
3157+#: ../DistUpgrade/DistUpgradeQuirks.py:236
3158 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
3159 msgstr ""
3160
3161-#: ../DistUpgrade/DistUpgradeQuirks.py:237
3162+#: ../DistUpgrade/DistUpgradeQuirks.py:238
3163 msgid ""
3164 "Running the 'unity' desktop environment is not fully supported by your "
3165 "graphics hardware. You will maybe end up in a very slow environment after "
3166@@ -954,11 +958,11 @@ msgid ""
3167 "upgrade?"
3168 msgstr ""
3169
3170-#: ../DistUpgrade/DistUpgradeQuirks.py:261
3171+#: ../DistUpgrade/DistUpgradeQuirks.py:262
3172 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
3173 msgstr ""
3174
3175-#: ../DistUpgrade/DistUpgradeQuirks.py:263
3176+#: ../DistUpgrade/DistUpgradeQuirks.py:264
3177 msgid ""
3178 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
3179 "and you may encounter problems after the upgrade. For more information see "
3180@@ -966,7 +970,7 @@ msgid ""
3181 "continue with the upgrade?"
3182 msgstr ""
3183
3184-#: ../DistUpgrade/DistUpgradeQuirks.py:283
3185+#: ../DistUpgrade/DistUpgradeQuirks.py:284
3186 msgid ""
3187 "Upgrading may reduce desktop effects, and performance in games and other "
3188 "graphically intensive programs."
3189@@ -974,7 +978,7 @@ msgstr ""
3190 "Dre an hizivaat e vo gwashaet efedoù ar burev marteze, an digonadoù evit ar "
3191 "c'hoarioù hag ar gouvlevioù a c'houlenn kalz a-fet kevregadoù."
3192
3193-#: ../DistUpgrade/DistUpgradeQuirks.py:287
3194+#: ../DistUpgrade/DistUpgradeQuirks.py:288
3195 msgid ""
3196 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
3197 "of this driver is available that works with your hardware in Ubuntu 10.04 "
3198@@ -988,12 +992,12 @@ msgstr ""
3199 "\n"
3200 "Ha fellout a ra deoc'h kenderc'hel ?"
3201
3202-#: ../DistUpgrade/DistUpgradeQuirks.py:326
3203-#: ../DistUpgrade/DistUpgradeQuirks.py:395
3204+#: ../DistUpgrade/DistUpgradeQuirks.py:327
3205+#: ../DistUpgrade/DistUpgradeQuirks.py:396
3206 msgid "Sorry, no more upgrades for this system"
3207 msgstr ""
3208
3209-#: ../DistUpgrade/DistUpgradeQuirks.py:327
3210+#: ../DistUpgrade/DistUpgradeQuirks.py:328
3211 #, python-format
3212 msgid ""
3213 "There will not be any further Ubuntu releases for this system's 'i386' "
3214@@ -1002,11 +1006,11 @@ msgid ""
3215 "Updates for Ubuntu %s will continue until %s."
3216 msgstr ""
3217
3218-#: ../DistUpgrade/DistUpgradeQuirks.py:342
3219+#: ../DistUpgrade/DistUpgradeQuirks.py:343
3220 msgid "No ARMv6 CPU"
3221 msgstr "Korrgewerier ARMv6 ebet"
3222
3223-#: ../DistUpgrade/DistUpgradeQuirks.py:343
3224+#: ../DistUpgrade/DistUpgradeQuirks.py:344
3225 msgid ""
3226 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
3227 "packages in karmic were built with optimizations requiring ARMv6 as the "
3228@@ -1018,12 +1022,12 @@ msgstr ""
3229 "c'houlenne da gaout ARMv6 evit adeiladezh izek. N'eus ket tro da hizivaat ho "
3230 "reizhiad da handelv nevez Ubuntu gant ar periant-mañ."
3231
3232-#: ../DistUpgrade/DistUpgradeQuirks.py:363
3233+#: ../DistUpgrade/DistUpgradeQuirks.py:364
3234 msgid ""
3235 "Sorry, this storage driver is not supported in kernels for newer releases"
3236 msgstr ""
3237
3238-#: ../DistUpgrade/DistUpgradeQuirks.py:365
3239+#: ../DistUpgrade/DistUpgradeQuirks.py:366
3240 #, python-format
3241 msgid ""
3242 "There will not be any further Ubuntu releases that provide kernel support "
3243@@ -1033,7 +1037,7 @@ msgid ""
3244 "driver, remove the directory %s and try again."
3245 msgstr ""
3246
3247-#: ../DistUpgrade/DistUpgradeQuirks.py:396
3248+#: ../DistUpgrade/DistUpgradeQuirks.py:397
3249 #, python-format
3250 msgid ""
3251 "There will not be any further Ubuntu releases for this system's POWER8 "
3252@@ -1042,12 +1046,12 @@ msgid ""
3253 "Updates for Ubuntu %s will continue until %s."
3254 msgstr ""
3255
3256-#: ../DistUpgrade/DistUpgradeQuirks.py:414
3257+#: ../DistUpgrade/DistUpgradeQuirks.py:415
3258 msgid "No init available"
3259 msgstr "an deraouekaat n'eo ket hegerz"
3260
3261 # daemon : argerzh en drekva
3262-#: ../DistUpgrade/DistUpgradeQuirks.py:415
3263+#: ../DistUpgrade/DistUpgradeQuirks.py:416
3264 msgid ""
3265 "Your system appears to be a virtualised environment without an init daemon, "
3266 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
3267@@ -1062,11 +1066,11 @@ msgstr ""
3268 "gefluniañ galloudel da gentañ.\n"
3269 "Ha fellout a ra deoc'h kenderc'hel ?"
3270
3271-#: ../DistUpgrade/DistUpgradeQuirks.py:456
3272+#: ../DistUpgrade/DistUpgradeQuirks.py:457
3273 msgid "The Robot Operating System (ROS) is installed"
3274 msgstr ""
3275
3276-#: ../DistUpgrade/DistUpgradeQuirks.py:457
3277+#: ../DistUpgrade/DistUpgradeQuirks.py:458
3278 msgid ""
3279 "It appears that ROS is currently installed. Each ROS release is very strict "
3280 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
3281@@ -1083,11 +1087,11 @@ msgid ""
3282 "Are you sure you want to continue?"
3283 msgstr ""
3284
3285-#: ../DistUpgrade/DistUpgradeQuirks.py:582
3286+#: ../DistUpgrade/DistUpgradeQuirks.py:583
3287 msgid "Connection to the Snap Store failed"
3288 msgstr ""
3289
3290-#: ../DistUpgrade/DistUpgradeQuirks.py:583
3291+#: ../DistUpgrade/DistUpgradeQuirks.py:584
3292 msgid ""
3293 "You have the package lxd installed but your system is unable to reach the "
3294 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
3295@@ -1097,11 +1101,11 @@ msgid ""
3296 "may want to configure a Snap Store proxy."
3297 msgstr ""
3298
3299-#: ../DistUpgrade/DistUpgradeQuirks.py:598
3300+#: ../DistUpgrade/DistUpgradeQuirks.py:599
3301 msgid "Connection to Snap Store failed"
3302 msgstr ""
3303
3304-#: ../DistUpgrade/DistUpgradeQuirks.py:599
3305+#: ../DistUpgrade/DistUpgradeQuirks.py:600
3306 msgid ""
3307 "Your system does not have a connection to the Snap Store. For the best "
3308 "upgrade experience make sure that your system can connect to api.snapcraft."
3309@@ -1109,11 +1113,11 @@ msgid ""
3310 "Do you still want to continue with the upgrade?"
3311 msgstr ""
3312
3313-#: ../DistUpgrade/DistUpgradeQuirks.py:608
3314+#: ../DistUpgrade/DistUpgradeQuirks.py:609
3315 msgid "Outdated snapd package"
3316 msgstr ""
3317
3318-#: ../DistUpgrade/DistUpgradeQuirks.py:609
3319+#: ../DistUpgrade/DistUpgradeQuirks.py:610
3320 msgid ""
3321 "Your system does not have the latest version of snapd. Please update the "
3322 "version of snapd on your system to improve the upgrade experience.\n"
3323@@ -1122,34 +1126,34 @@ msgstr ""
3324
3325 #. now perform direct API calls to the store, requesting size
3326 #. information for each of the snaps needing installation
3327-#: ../DistUpgrade/DistUpgradeQuirks.py:634
3328+#: ../DistUpgrade/DistUpgradeQuirks.py:635
3329 msgid "Calculating snap size requirements"
3330 msgstr ""
3331
3332-#: ../DistUpgrade/DistUpgradeQuirks.py:665
3333+#: ../DistUpgrade/DistUpgradeQuirks.py:666
3334 msgid "Processing snap replacements"
3335 msgstr ""
3336
3337-#: ../DistUpgrade/DistUpgradeQuirks.py:671
3338+#: ../DistUpgrade/DistUpgradeQuirks.py:672
3339 #, python-format
3340 msgid "refreshing snap %s"
3341 msgstr ""
3342
3343-#: ../DistUpgrade/DistUpgradeQuirks.py:675
3344+#: ../DistUpgrade/DistUpgradeQuirks.py:676
3345 #, python-format
3346 msgid "removing snap %s"
3347 msgstr ""
3348
3349-#: ../DistUpgrade/DistUpgradeQuirks.py:678
3350+#: ../DistUpgrade/DistUpgradeQuirks.py:679
3351 #, python-format
3352 msgid "installing snap %s"
3353 msgstr ""
3354
3355-#: ../DistUpgrade/DistUpgradeQuirks.py:707
3356+#: ../DistUpgrade/DistUpgradeQuirks.py:708
3357 msgid "PAE not enabled"
3358 msgstr ""
3359
3360-#: ../DistUpgrade/DistUpgradeQuirks.py:708
3361+#: ../DistUpgrade/DistUpgradeQuirks.py:709
3362 msgid ""
3363 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
3364 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
3365@@ -1157,11 +1161,11 @@ msgid ""
3366 "http://help.ubuntu.com/community/EnablingPAE"
3367 msgstr ""
3368
3369-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
3370+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
3371 msgid "universe component not enabled"
3372 msgstr ""
3373
3374-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
3375+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
3376 #, python-format
3377 msgid ""
3378 "You have the package %s installed which is a python2 package. python2 has "
3379@@ -1173,7 +1177,7 @@ msgid ""
3380 "universe component in /etc/apt/sources.list or remove %s"
3381 msgstr ""
3382
3383-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
3384+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
3385 msgid "Checking for installed snaps"
3386 msgstr ""
3387
3388diff --git a/po/bs.po b/po/bs.po
3389index 905513c..96d7d64 100644
3390--- a/po/bs.po
3391+++ b/po/bs.po
3392@@ -8,7 +8,11 @@ msgid ""
3393 msgstr ""
3394 "Project-Id-Version: update-manager\n"
3395 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
3396+<<<<<<< po/bs.po
3397 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
3398+=======
3399+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
3400+>>>>>>> po/bs.po
3401 "PO-Revision-Date: 2019-06-18 17:53+0000\n"
3402 "Last-Translator: Brian Murray <brian@ubuntu.com>\n"
3403 "Language-Team: Bosnian <bs@li.org>\n"
3404@@ -1027,13 +1031,13 @@ msgstr "Molim, ubacite '%s' u uređaj '%s'"
3405 msgid "Media Change"
3406 msgstr "Izmjena Medija"
3407
3408-#: ../DistUpgrade/DistUpgradeQuirks.py:235
3409+#: ../DistUpgrade/DistUpgradeQuirks.py:236
3410 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
3411 msgstr ""
3412 "Postoji mogućnost da vaš grafički hardver ne bude u potpunosti podržan na "
3413 "Ubuntu 14.04."
3414
3415-#: ../DistUpgrade/DistUpgradeQuirks.py:237
3416+#: ../DistUpgrade/DistUpgradeQuirks.py:238
3417 msgid ""
3418 "Running the 'unity' desktop environment is not fully supported by your "
3419 "graphics hardware. You will maybe end up in a very slow environment after "
3420@@ -1047,11 +1051,11 @@ msgstr ""
3421 "sačuvate LTS verziju. Za više informacija pogledajte https://wiki.ubuntu.com/"
3422 "X/Bugs/UpdateManagerWarningForUnity3D Želite li nastaviti s nadogradnjom?"
3423
3424-#: ../DistUpgrade/DistUpgradeQuirks.py:261
3425+#: ../DistUpgrade/DistUpgradeQuirks.py:262
3426 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
3427 msgstr "Vaš grafički hardver možda nije potpuno podržan u Ubuntu 12.04 LTS."
3428
3429-#: ../DistUpgrade/DistUpgradeQuirks.py:263
3430+#: ../DistUpgrade/DistUpgradeQuirks.py:264
3431 msgid ""
3432 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
3433 "and you may encounter problems after the upgrade. For more information see "
3434@@ -1063,7 +1067,7 @@ msgstr ""
3435 "wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Želite li nastaviti sa "
3436 "nadogradnjom?"
3437
3438-#: ../DistUpgrade/DistUpgradeQuirks.py:283
3439+#: ../DistUpgrade/DistUpgradeQuirks.py:284
3440 msgid ""
3441 "Upgrading may reduce desktop effects, and performance in games and other "
3442 "graphically intensive programs."
3443@@ -1071,7 +1075,7 @@ msgstr ""
3444 "Nadogradnja može reducirati desktop efekte i učinak u igrama i drugim "
3445 "grafički zahtjevnim programima."
3446
3447-#: ../DistUpgrade/DistUpgradeQuirks.py:287
3448+#: ../DistUpgrade/DistUpgradeQuirks.py:288
3449 msgid ""
3450 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
3451 "of this driver is available that works with your hardware in Ubuntu 10.04 "
3452@@ -1084,12 +1088,12 @@ msgstr ""
3453 "\n"
3454 "Da li želite da nastavite?"
3455
3456-#: ../DistUpgrade/DistUpgradeQuirks.py:326
3457-#: ../DistUpgrade/DistUpgradeQuirks.py:395
3458+#: ../DistUpgrade/DistUpgradeQuirks.py:327
3459+#: ../DistUpgrade/DistUpgradeQuirks.py:396
3460 msgid "Sorry, no more upgrades for this system"
3461 msgstr ""
3462
3463-#: ../DistUpgrade/DistUpgradeQuirks.py:327
3464+#: ../DistUpgrade/DistUpgradeQuirks.py:328
3465 #, python-format
3466 msgid ""
3467 "There will not be any further Ubuntu releases for this system's 'i386' "
3468@@ -1098,11 +1102,11 @@ msgid ""
3469 "Updates for Ubuntu %s will continue until %s."
3470 msgstr ""
3471
3472-#: ../DistUpgrade/DistUpgradeQuirks.py:342
3473+#: ../DistUpgrade/DistUpgradeQuirks.py:343
3474 msgid "No ARMv6 CPU"
3475 msgstr "Nema ARMv6 procesora"
3476
3477-#: ../DistUpgrade/DistUpgradeQuirks.py:343
3478+#: ../DistUpgrade/DistUpgradeQuirks.py:344
3479 msgid ""
3480 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
3481 "packages in karmic were built with optimizations requiring ARMv6 as the "
3482@@ -1114,12 +1118,12 @@ msgstr ""
3483 "minimalnu arhitekturu. Nije moguće nadograditi vaš sistem na novo Ubuntu "
3484 "izdanje sa ovim hardverom."
3485
3486-#: ../DistUpgrade/DistUpgradeQuirks.py:363
3487+#: ../DistUpgrade/DistUpgradeQuirks.py:364
3488 msgid ""
3489 "Sorry, this storage driver is not supported in kernels for newer releases"
3490 msgstr ""
3491
3492-#: ../DistUpgrade/DistUpgradeQuirks.py:365
3493+#: ../DistUpgrade/DistUpgradeQuirks.py:366
3494 #, python-format
3495 msgid ""
3496 "There will not be any further Ubuntu releases that provide kernel support "
3497@@ -1129,7 +1133,7 @@ msgid ""
3498 "driver, remove the directory %s and try again."
3499 msgstr ""
3500
3501-#: ../DistUpgrade/DistUpgradeQuirks.py:396
3502+#: ../DistUpgrade/DistUpgradeQuirks.py:397
3503 #, python-format
3504 msgid ""
3505 "There will not be any further Ubuntu releases for this system's POWER8 "
3506@@ -1138,11 +1142,11 @@ msgid ""
3507 "Updates for Ubuntu %s will continue until %s."
3508 msgstr ""
3509
3510-#: ../DistUpgrade/DistUpgradeQuirks.py:414
3511+#: ../DistUpgrade/DistUpgradeQuirks.py:415
3512 msgid "No init available"
3513 msgstr "init nije dostupan"
3514
3515-#: ../DistUpgrade/DistUpgradeQuirks.py:415
3516+#: ../DistUpgrade/DistUpgradeQuirks.py:416
3517 msgid ""
3518 "Your system appears to be a virtualised environment without an init daemon, "
3519 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
3520@@ -1157,11 +1161,11 @@ msgstr ""
3521 "\n"
3522 "Da li ste sigurni da želite na nastavite?"
3523
3524-#: ../DistUpgrade/DistUpgradeQuirks.py:456
3525+#: ../DistUpgrade/DistUpgradeQuirks.py:457
3526 msgid "The Robot Operating System (ROS) is installed"
3527 msgstr ""
3528
3529-#: ../DistUpgrade/DistUpgradeQuirks.py:457
3530+#: ../DistUpgrade/DistUpgradeQuirks.py:458
3531 msgid ""
3532 "It appears that ROS is currently installed. Each ROS release is very strict "
3533 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
3534@@ -1178,11 +1182,11 @@ msgid ""
3535 "Are you sure you want to continue?"
3536 msgstr ""
3537
3538-#: ../DistUpgrade/DistUpgradeQuirks.py:582
3539+#: ../DistUpgrade/DistUpgradeQuirks.py:583
3540 msgid "Connection to the Snap Store failed"
3541 msgstr ""
3542
3543-#: ../DistUpgrade/DistUpgradeQuirks.py:583
3544+#: ../DistUpgrade/DistUpgradeQuirks.py:584
3545 msgid ""
3546 "You have the package lxd installed but your system is unable to reach the "
3547 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
3548@@ -1192,11 +1196,11 @@ msgid ""
3549 "may want to configure a Snap Store proxy."
3550 msgstr ""
3551
3552-#: ../DistUpgrade/DistUpgradeQuirks.py:598
3553+#: ../DistUpgrade/DistUpgradeQuirks.py:599
3554 msgid "Connection to Snap Store failed"
3555 msgstr ""
3556
3557-#: ../DistUpgrade/DistUpgradeQuirks.py:599
3558+#: ../DistUpgrade/DistUpgradeQuirks.py:600
3559 msgid ""
3560 "Your system does not have a connection to the Snap Store. For the best "
3561 "upgrade experience make sure that your system can connect to api.snapcraft."
3562@@ -1204,11 +1208,11 @@ msgid ""
3563 "Do you still want to continue with the upgrade?"
3564 msgstr ""
3565
3566-#: ../DistUpgrade/DistUpgradeQuirks.py:608
3567+#: ../DistUpgrade/DistUpgradeQuirks.py:609
3568 msgid "Outdated snapd package"
3569 msgstr ""
3570
3571-#: ../DistUpgrade/DistUpgradeQuirks.py:609
3572+#: ../DistUpgrade/DistUpgradeQuirks.py:610
3573 msgid ""
3574 "Your system does not have the latest version of snapd. Please update the "
3575 "version of snapd on your system to improve the upgrade experience.\n"
3576@@ -1217,34 +1221,34 @@ msgstr ""
3577
3578 #. now perform direct API calls to the store, requesting size
3579 #. information for each of the snaps needing installation
3580-#: ../DistUpgrade/DistUpgradeQuirks.py:634
3581+#: ../DistUpgrade/DistUpgradeQuirks.py:635
3582 msgid "Calculating snap size requirements"
3583 msgstr ""
3584
3585-#: ../DistUpgrade/DistUpgradeQuirks.py:665
3586+#: ../DistUpgrade/DistUpgradeQuirks.py:666
3587 msgid "Processing snap replacements"
3588 msgstr ""
3589
3590-#: ../DistUpgrade/DistUpgradeQuirks.py:671
3591+#: ../DistUpgrade/DistUpgradeQuirks.py:672
3592 #, python-format
3593 msgid "refreshing snap %s"
3594 msgstr ""
3595
3596-#: ../DistUpgrade/DistUpgradeQuirks.py:675
3597+#: ../DistUpgrade/DistUpgradeQuirks.py:676
3598 #, python-format
3599 msgid "removing snap %s"
3600 msgstr ""
3601
3602-#: ../DistUpgrade/DistUpgradeQuirks.py:678
3603+#: ../DistUpgrade/DistUpgradeQuirks.py:679
3604 #, python-format
3605 msgid "installing snap %s"
3606 msgstr ""
3607
3608-#: ../DistUpgrade/DistUpgradeQuirks.py:707
3609+#: ../DistUpgrade/DistUpgradeQuirks.py:708
3610 msgid "PAE not enabled"
3611 msgstr "PAE nije uključen"
3612
3613-#: ../DistUpgrade/DistUpgradeQuirks.py:708
3614+#: ../DistUpgrade/DistUpgradeQuirks.py:709
3615 msgid ""
3616 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
3617 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
3618@@ -1256,11 +1260,11 @@ msgstr ""
3619 "omogućiti PAE (ako je to moguće) vidi:\n"
3620 "http://help.ubuntu.com/community/EnablingPAE"
3621
3622-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
3623+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
3624 msgid "universe component not enabled"
3625 msgstr ""
3626
3627-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
3628+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
3629 #, python-format
3630 msgid ""
3631 "You have the package %s installed which is a python2 package. python2 has "
3632@@ -1272,7 +1276,7 @@ msgid ""
3633 "universe component in /etc/apt/sources.list or remove %s"
3634 msgstr ""
3635
3636-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
3637+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
3638 msgid "Checking for installed snaps"
3639 msgstr ""
3640
3641diff --git a/po/ca.po b/po/ca.po
3642index 5f88810..cc53a26 100644
3643--- a/po/ca.po
3644+++ b/po/ca.po
3645@@ -8,7 +8,11 @@ msgid ""
3646 msgstr ""
3647 "Project-Id-Version: update-manager\n"
3648 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
3649+<<<<<<< po/ca.po
3650 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
3651+=======
3652+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
3653+>>>>>>> po/ca.po
3654 "PO-Revision-Date: 2019-06-18 17:52+0000\n"
3655 "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
3656 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
3657@@ -1038,12 +1042,12 @@ msgstr "Inseriu «%s» a la unitat «%s»"
3658 msgid "Media Change"
3659 msgstr "Canvi de suport"
3660
3661-#: ../DistUpgrade/DistUpgradeQuirks.py:235
3662+#: ../DistUpgrade/DistUpgradeQuirks.py:236
3663 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
3664 msgstr ""
3665 "Pot ser que el vostre maquinari de gràfics no funcioni bé amb l'Ubuntu 14.04."
3666
3667-#: ../DistUpgrade/DistUpgradeQuirks.py:237
3668+#: ../DistUpgrade/DistUpgradeQuirks.py:238
3669 msgid ""
3670 "Running the 'unity' desktop environment is not fully supported by your "
3671 "graphics hardware. You will maybe end up in a very slow environment after "
3672@@ -1059,13 +1063,13 @@ msgstr ""
3673 "UpdateManagerWarningForUnity3D. Tot i això, voleu continuar amb "
3674 "l'actualització?"
3675
3676-#: ../DistUpgrade/DistUpgradeQuirks.py:261
3677+#: ../DistUpgrade/DistUpgradeQuirks.py:262
3678 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
3679 msgstr ""
3680 "Sembla que el vostre maquinari gràfic no és totalment compatible amb "
3681 "l'Ubuntu 12.04 LTS."
3682
3683-#: ../DistUpgrade/DistUpgradeQuirks.py:263
3684+#: ../DistUpgrade/DistUpgradeQuirks.py:264
3685 msgid ""
3686 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
3687 "and you may encounter problems after the upgrade. For more information see "
3688@@ -1077,7 +1081,7 @@ msgstr ""
3689 "informació visiteu https://wiki.ubuntu.com/X/Bugs/"
3690 "UpdateManagerWarningForI8xx. Voleu continuar amb l'actualització?"
3691
3692-#: ../DistUpgrade/DistUpgradeQuirks.py:283
3693+#: ../DistUpgrade/DistUpgradeQuirks.py:284
3694 msgid ""
3695 "Upgrading may reduce desktop effects, and performance in games and other "
3696 "graphically intensive programs."
3697@@ -1085,7 +1089,7 @@ msgstr ""
3698 "L'actualització pot reduir els efectes d'escriptori i el rendiment en jocs i "
3699 "altres programes que facin un ús exhaustiu de processament gràfic."
3700
3701-#: ../DistUpgrade/DistUpgradeQuirks.py:287
3702+#: ../DistUpgrade/DistUpgradeQuirks.py:288
3703 msgid ""
3704 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
3705 "of this driver is available that works with your hardware in Ubuntu 10.04 "
3706@@ -1099,12 +1103,12 @@ msgstr ""
3707 "\n"
3708 "Voleu continuar?"
3709
3710-#: ../DistUpgrade/DistUpgradeQuirks.py:326
3711-#: ../DistUpgrade/DistUpgradeQuirks.py:395
3712+#: ../DistUpgrade/DistUpgradeQuirks.py:327
3713+#: ../DistUpgrade/DistUpgradeQuirks.py:396
3714 msgid "Sorry, no more upgrades for this system"
3715 msgstr ""
3716
3717-#: ../DistUpgrade/DistUpgradeQuirks.py:327
3718+#: ../DistUpgrade/DistUpgradeQuirks.py:328
3719 #, python-format
3720 msgid ""
3721 "There will not be any further Ubuntu releases for this system's 'i386' "
3722@@ -1113,11 +1117,11 @@ msgid ""
3723 "Updates for Ubuntu %s will continue until %s."
3724 msgstr ""
3725
3726-#: ../DistUpgrade/DistUpgradeQuirks.py:342
3727+#: ../DistUpgrade/DistUpgradeQuirks.py:343
3728 msgid "No ARMv6 CPU"
3729 msgstr "No és una CPU ARMv6"
3730
3731-#: ../DistUpgrade/DistUpgradeQuirks.py:343
3732+#: ../DistUpgrade/DistUpgradeQuirks.py:344
3733 msgid ""
3734 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
3735 "packages in karmic were built with optimizations requiring ARMv6 as the "
3736@@ -1129,12 +1133,12 @@ msgstr ""
3737 "requereixen l'ARMv6 com a arquitectura mínima. No és possible actualitzar el "
3738 "vostre sistema a una versió nova de l'Ubuntu amb aquest maquinari."
3739
3740-#: ../DistUpgrade/DistUpgradeQuirks.py:363
3741+#: ../DistUpgrade/DistUpgradeQuirks.py:364
3742 msgid ""
3743 "Sorry, this storage driver is not supported in kernels for newer releases"
3744 msgstr ""
3745
3746-#: ../DistUpgrade/DistUpgradeQuirks.py:365
3747+#: ../DistUpgrade/DistUpgradeQuirks.py:366
3748 #, python-format
3749 msgid ""
3750 "There will not be any further Ubuntu releases that provide kernel support "
3751@@ -1144,7 +1148,7 @@ msgid ""
3752 "driver, remove the directory %s and try again."
3753 msgstr ""
3754
3755-#: ../DistUpgrade/DistUpgradeQuirks.py:396
3756+#: ../DistUpgrade/DistUpgradeQuirks.py:397
3757 #, python-format
3758 msgid ""
3759 "There will not be any further Ubuntu releases for this system's POWER8 "
3760@@ -1153,11 +1157,11 @@ msgid ""
3761 "Updates for Ubuntu %s will continue until %s."
3762 msgstr ""
3763
3764-#: ../DistUpgrade/DistUpgradeQuirks.py:414
3765+#: ../DistUpgrade/DistUpgradeQuirks.py:415
3766 msgid "No init available"
3767 msgstr "No hi ha cap sistema d'inicialització disponible"
3768
3769-#: ../DistUpgrade/DistUpgradeQuirks.py:415
3770+#: ../DistUpgrade/DistUpgradeQuirks.py:416
3771 msgid ""
3772 "Your system appears to be a virtualised environment without an init daemon, "
3773 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
3774@@ -1173,11 +1177,11 @@ msgstr ""
3775 "\n"
3776 "Esteu segur que voleu continuar?"
3777
3778-#: ../DistUpgrade/DistUpgradeQuirks.py:456
3779+#: ../DistUpgrade/DistUpgradeQuirks.py:457
3780 msgid "The Robot Operating System (ROS) is installed"
3781 msgstr ""
3782
3783-#: ../DistUpgrade/DistUpgradeQuirks.py:457
3784+#: ../DistUpgrade/DistUpgradeQuirks.py:458
3785 msgid ""
3786 "It appears that ROS is currently installed. Each ROS release is very strict "
3787 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
3788@@ -1194,12 +1198,12 @@ msgid ""
3789 "Are you sure you want to continue?"
3790 msgstr ""
3791
3792-#: ../DistUpgrade/DistUpgradeQuirks.py:582
3793+#: ../DistUpgrade/DistUpgradeQuirks.py:583
3794 #, fuzzy
3795 msgid "Connection to the Snap Store failed"
3796 msgstr "Ha fallat la connexió a la Botiga Snap"
3797
3798-#: ../DistUpgrade/DistUpgradeQuirks.py:583
3799+#: ../DistUpgrade/DistUpgradeQuirks.py:584
3800 msgid ""
3801 "You have the package lxd installed but your system is unable to reach the "
3802 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
3803@@ -1209,11 +1213,11 @@ msgid ""
3804 "may want to configure a Snap Store proxy."
3805 msgstr ""
3806
3807-#: ../DistUpgrade/DistUpgradeQuirks.py:598
3808+#: ../DistUpgrade/DistUpgradeQuirks.py:599
3809 msgid "Connection to Snap Store failed"
3810 msgstr "Ha fallat la connexió a la Botiga Snap"
3811
3812-#: ../DistUpgrade/DistUpgradeQuirks.py:599
3813+#: ../DistUpgrade/DistUpgradeQuirks.py:600
3814 msgid ""
3815 "Your system does not have a connection to the Snap Store. For the best "
3816 "upgrade experience make sure that your system can connect to api.snapcraft."
3817@@ -1225,11 +1229,11 @@ msgstr ""
3818 "a api.snapcraft.io.\n"
3819 "Encara voleu continuar amb l'actualització?"
3820
3821-#: ../DistUpgrade/DistUpgradeQuirks.py:608
3822+#: ../DistUpgrade/DistUpgradeQuirks.py:609
3823 msgid "Outdated snapd package"
3824 msgstr "Paquet snapd desactualitzat"
3825
3826-#: ../DistUpgrade/DistUpgradeQuirks.py:609
3827+#: ../DistUpgrade/DistUpgradeQuirks.py:610
3828 msgid ""
3829 "Your system does not have the latest version of snapd. Please update the "
3830 "version of snapd on your system to improve the upgrade experience.\n"
3831@@ -1242,34 +1246,34 @@ msgstr ""
3832
3833 #. now perform direct API calls to the store, requesting size
3834 #. information for each of the snaps needing installation
3835-#: ../DistUpgrade/DistUpgradeQuirks.py:634
3836+#: ../DistUpgrade/DistUpgradeQuirks.py:635
3837 msgid "Calculating snap size requirements"
3838 msgstr ""
3839
3840-#: ../DistUpgrade/DistUpgradeQuirks.py:665
3841+#: ../DistUpgrade/DistUpgradeQuirks.py:666
3842 msgid "Processing snap replacements"
3843 msgstr ""
3844
3845-#: ../DistUpgrade/DistUpgradeQuirks.py:671
3846+#: ../DistUpgrade/DistUpgradeQuirks.py:672
3847 #, python-format
3848 msgid "refreshing snap %s"
3849 msgstr ""
3850
3851-#: ../DistUpgrade/DistUpgradeQuirks.py:675
3852+#: ../DistUpgrade/DistUpgradeQuirks.py:676
3853 #, python-format
3854 msgid "removing snap %s"
3855 msgstr ""
3856
3857-#: ../DistUpgrade/DistUpgradeQuirks.py:678
3858+#: ../DistUpgrade/DistUpgradeQuirks.py:679
3859 #, python-format
3860 msgid "installing snap %s"
3861 msgstr ""
3862
3863-#: ../DistUpgrade/DistUpgradeQuirks.py:707
3864+#: ../DistUpgrade/DistUpgradeQuirks.py:708
3865 msgid "PAE not enabled"
3866 msgstr "El PAE no està habilitat"
3867
3868-#: ../DistUpgrade/DistUpgradeQuirks.py:708
3869+#: ../DistUpgrade/DistUpgradeQuirks.py:709
3870 msgid ""
3871 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
3872 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
3873@@ -1282,11 +1286,11 @@ msgstr ""
3874 "Consulteu la documentació següent per obtenir més informació:\n"
3875 "http://help.ubuntu.com/community/EnablingPAE"
3876
3877-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
3878+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
3879 msgid "universe component not enabled"
3880 msgstr ""
3881
3882-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
3883+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
3884 #, python-format
3885 msgid ""
3886 "You have the package %s installed which is a python2 package. python2 has "
3887@@ -1298,7 +1302,7 @@ msgid ""
3888 "universe component in /etc/apt/sources.list or remove %s"
3889 msgstr ""
3890
3891-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
3892+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
3893 msgid "Checking for installed snaps"
3894 msgstr "S'està comprovant si hi ha snaps instal·lats"
3895
3896diff --git a/po/ca@valencia.po b/po/ca@valencia.po
3897index 4950923..a027d9b 100644
3898--- a/po/ca@valencia.po
3899+++ b/po/ca@valencia.po
3900@@ -8,7 +8,11 @@ msgid ""
3901 msgstr ""
3902 "Project-Id-Version: update-manager\n"
3903 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
3904+<<<<<<< po/ca@valencia.po
3905 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
3906+=======
3907+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
3908+>>>>>>> po/ca@valencia.po
3909 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
3910 "Last-Translator: Joan Duran <jodufi@gmail.com>\n"
3911 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
3912@@ -969,12 +973,12 @@ msgstr "Inseriu «%s» a la unitat «%s»"
3913 msgid "Media Change"
3914 msgstr "Canvi de suport"
3915
3916-#: ../DistUpgrade/DistUpgradeQuirks.py:235
3917+#: ../DistUpgrade/DistUpgradeQuirks.py:236
3918 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
3919 msgstr ""
3920 "Pot ser que el vostre maquinari de gràfics no funcione bé amb l'Ubuntu 14.04."
3921
3922-#: ../DistUpgrade/DistUpgradeQuirks.py:237
3923+#: ../DistUpgrade/DistUpgradeQuirks.py:238
3924 msgid ""
3925 "Running the 'unity' desktop environment is not fully supported by your "
3926 "graphics hardware. You will maybe end up in a very slow environment after "
3927@@ -984,11 +988,11 @@ msgid ""
3928 "upgrade?"
3929 msgstr ""
3930
3931-#: ../DistUpgrade/DistUpgradeQuirks.py:261
3932+#: ../DistUpgrade/DistUpgradeQuirks.py:262
3933 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
3934 msgstr ""
3935
3936-#: ../DistUpgrade/DistUpgradeQuirks.py:263
3937+#: ../DistUpgrade/DistUpgradeQuirks.py:264
3938 msgid ""
3939 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
3940 "and you may encounter problems after the upgrade. For more information see "
3941@@ -996,7 +1000,7 @@ msgid ""
3942 "continue with the upgrade?"
3943 msgstr ""
3944
3945-#: ../DistUpgrade/DistUpgradeQuirks.py:283
3946+#: ../DistUpgrade/DistUpgradeQuirks.py:284
3947 msgid ""
3948 "Upgrading may reduce desktop effects, and performance in games and other "
3949 "graphically intensive programs."
3950@@ -1004,7 +1008,7 @@ msgstr ""
3951 "L'actualització pot reduir els efectes d'escriptori i el rendiment en jocs i "
3952 "altres programes que facen un ús exhaustiu de processament gràfic."
3953
3954-#: ../DistUpgrade/DistUpgradeQuirks.py:287
3955+#: ../DistUpgrade/DistUpgradeQuirks.py:288
3956 msgid ""
3957 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
3958 "of this driver is available that works with your hardware in Ubuntu 10.04 "
3959@@ -1018,12 +1022,12 @@ msgstr ""
3960 "\n"
3961 "Voleu continuar?"
3962
3963-#: ../DistUpgrade/DistUpgradeQuirks.py:326
3964-#: ../DistUpgrade/DistUpgradeQuirks.py:395
3965+#: ../DistUpgrade/DistUpgradeQuirks.py:327
3966+#: ../DistUpgrade/DistUpgradeQuirks.py:396
3967 msgid "Sorry, no more upgrades for this system"
3968 msgstr ""
3969
3970-#: ../DistUpgrade/DistUpgradeQuirks.py:327
3971+#: ../DistUpgrade/DistUpgradeQuirks.py:328
3972 #, python-format
3973 msgid ""
3974 "There will not be any further Ubuntu releases for this system's 'i386' "
3975@@ -1032,11 +1036,11 @@ msgid ""
3976 "Updates for Ubuntu %s will continue until %s."
3977 msgstr ""
3978
3979-#: ../DistUpgrade/DistUpgradeQuirks.py:342
3980+#: ../DistUpgrade/DistUpgradeQuirks.py:343
3981 msgid "No ARMv6 CPU"
3982 msgstr "No és una CPU ARMv6"
3983
3984-#: ../DistUpgrade/DistUpgradeQuirks.py:343
3985+#: ../DistUpgrade/DistUpgradeQuirks.py:344
3986 msgid ""
3987 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
3988 "packages in karmic were built with optimizations requiring ARMv6 as the "
3989@@ -1048,12 +1052,12 @@ msgstr ""
3990 "requereixen l'ARMv6 com a arquitectura mínima. No és possible actualitzar el "
3991 "vostre sistema a una versió nova de l'Ubuntu amb este maquinari."
3992
3993-#: ../DistUpgrade/DistUpgradeQuirks.py:363
3994+#: ../DistUpgrade/DistUpgradeQuirks.py:364
3995 msgid ""
3996 "Sorry, this storage driver is not supported in kernels for newer releases"
3997 msgstr ""
3998
3999-#: ../DistUpgrade/DistUpgradeQuirks.py:365
4000+#: ../DistUpgrade/DistUpgradeQuirks.py:366
4001 #, python-format
4002 msgid ""
4003 "There will not be any further Ubuntu releases that provide kernel support "
4004@@ -1063,7 +1067,7 @@ msgid ""
4005 "driver, remove the directory %s and try again."
4006 msgstr ""
4007
4008-#: ../DistUpgrade/DistUpgradeQuirks.py:396
4009+#: ../DistUpgrade/DistUpgradeQuirks.py:397
4010 #, python-format
4011 msgid ""
4012 "There will not be any further Ubuntu releases for this system's POWER8 "
4013@@ -1072,11 +1076,11 @@ msgid ""
4014 "Updates for Ubuntu %s will continue until %s."
4015 msgstr ""
4016
4017-#: ../DistUpgrade/DistUpgradeQuirks.py:414
4018+#: ../DistUpgrade/DistUpgradeQuirks.py:415
4019 msgid "No init available"
4020 msgstr "No hi ha cap sistema d'inicialització disponible"
4021
4022-#: ../DistUpgrade/DistUpgradeQuirks.py:415
4023+#: ../DistUpgrade/DistUpgradeQuirks.py:416
4024 msgid ""
4025 "Your system appears to be a virtualised environment without an init daemon, "
4026 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
4027@@ -1092,11 +1096,11 @@ msgstr ""
4028 "\n"
4029 "Segur que voleu continuar?"
4030
4031-#: ../DistUpgrade/DistUpgradeQuirks.py:456
4032+#: ../DistUpgrade/DistUpgradeQuirks.py:457
4033 msgid "The Robot Operating System (ROS) is installed"
4034 msgstr ""
4035
4036-#: ../DistUpgrade/DistUpgradeQuirks.py:457
4037+#: ../DistUpgrade/DistUpgradeQuirks.py:458
4038 msgid ""
4039 "It appears that ROS is currently installed. Each ROS release is very strict "
4040 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
4041@@ -1113,11 +1117,11 @@ msgid ""
4042 "Are you sure you want to continue?"
4043 msgstr ""
4044
4045-#: ../DistUpgrade/DistUpgradeQuirks.py:582
4046+#: ../DistUpgrade/DistUpgradeQuirks.py:583
4047 msgid "Connection to the Snap Store failed"
4048 msgstr ""
4049
4050-#: ../DistUpgrade/DistUpgradeQuirks.py:583
4051+#: ../DistUpgrade/DistUpgradeQuirks.py:584
4052 msgid ""
4053 "You have the package lxd installed but your system is unable to reach the "
4054 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
4055@@ -1127,11 +1131,11 @@ msgid ""
4056 "may want to configure a Snap Store proxy."
4057 msgstr ""
4058
4059-#: ../DistUpgrade/DistUpgradeQuirks.py:598
4060+#: ../DistUpgrade/DistUpgradeQuirks.py:599
4061 msgid "Connection to Snap Store failed"
4062 msgstr ""
4063
4064-#: ../DistUpgrade/DistUpgradeQuirks.py:599
4065+#: ../DistUpgrade/DistUpgradeQuirks.py:600
4066 msgid ""
4067 "Your system does not have a connection to the Snap Store. For the best "
4068 "upgrade experience make sure that your system can connect to api.snapcraft."
4069@@ -1139,11 +1143,11 @@ msgid ""
4070 "Do you still want to continue with the upgrade?"
4071 msgstr ""
4072
4073-#: ../DistUpgrade/DistUpgradeQuirks.py:608
4074+#: ../DistUpgrade/DistUpgradeQuirks.py:609
4075 msgid "Outdated snapd package"
4076 msgstr ""
4077
4078-#: ../DistUpgrade/DistUpgradeQuirks.py:609
4079+#: ../DistUpgrade/DistUpgradeQuirks.py:610
4080 msgid ""
4081 "Your system does not have the latest version of snapd. Please update the "
4082 "version of snapd on your system to improve the upgrade experience.\n"
4083@@ -1152,34 +1156,34 @@ msgstr ""
4084
4085 #. now perform direct API calls to the store, requesting size
4086 #. information for each of the snaps needing installation
4087-#: ../DistUpgrade/DistUpgradeQuirks.py:634
4088+#: ../DistUpgrade/DistUpgradeQuirks.py:635
4089 msgid "Calculating snap size requirements"
4090 msgstr ""
4091
4092-#: ../DistUpgrade/DistUpgradeQuirks.py:665
4093+#: ../DistUpgrade/DistUpgradeQuirks.py:666
4094 msgid "Processing snap replacements"
4095 msgstr ""
4096
4097-#: ../DistUpgrade/DistUpgradeQuirks.py:671
4098+#: ../DistUpgrade/DistUpgradeQuirks.py:672
4099 #, python-format
4100 msgid "refreshing snap %s"
4101 msgstr ""
4102
4103-#: ../DistUpgrade/DistUpgradeQuirks.py:675
4104+#: ../DistUpgrade/DistUpgradeQuirks.py:676
4105 #, python-format
4106 msgid "removing snap %s"
4107 msgstr ""
4108
4109-#: ../DistUpgrade/DistUpgradeQuirks.py:678
4110+#: ../DistUpgrade/DistUpgradeQuirks.py:679
4111 #, python-format
4112 msgid "installing snap %s"
4113 msgstr ""
4114
4115-#: ../DistUpgrade/DistUpgradeQuirks.py:707
4116+#: ../DistUpgrade/DistUpgradeQuirks.py:708
4117 msgid "PAE not enabled"
4118 msgstr "El PAE no està habilitat"
4119
4120-#: ../DistUpgrade/DistUpgradeQuirks.py:708
4121+#: ../DistUpgrade/DistUpgradeQuirks.py:709
4122 msgid ""
4123 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
4124 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
4125@@ -1192,11 +1196,11 @@ msgstr ""
4126 "Consulteu la documentació següent per obtindre més informació:\n"
4127 "http://help.ubuntu.com/community/EnablingPAE"
4128
4129-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
4130+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
4131 msgid "universe component not enabled"
4132 msgstr ""
4133
4134-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
4135+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
4136 #, python-format
4137 msgid ""
4138 "You have the package %s installed which is a python2 package. python2 has "
4139@@ -1208,7 +1212,7 @@ msgid ""
4140 "universe component in /etc/apt/sources.list or remove %s"
4141 msgstr ""
4142
4143-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
4144+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
4145 msgid "Checking for installed snaps"
4146 msgstr ""
4147
4148diff --git a/po/ce.po b/po/ce.po
4149index 05704af..a48dd1b 100644
4150--- a/po/ce.po
4151+++ b/po/ce.po
4152@@ -8,7 +8,11 @@ msgid ""
4153 msgstr ""
4154 "Project-Id-Version: ubuntu-release-upgrader\n"
4155 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
4156+<<<<<<< po/ce.po
4157 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
4158+=======
4159+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
4160+>>>>>>> po/ce.po
4161 "PO-Revision-Date: 2014-08-21 06:20+0000\n"
4162 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
4163 "Language-Team: Chechen <ce@li.org>\n"
4164@@ -917,11 +921,11 @@ msgstr ""
4165 msgid "Media Change"
4166 msgstr ""
4167
4168-#: ../DistUpgrade/DistUpgradeQuirks.py:235
4169+#: ../DistUpgrade/DistUpgradeQuirks.py:236
4170 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
4171 msgstr ""
4172
4173-#: ../DistUpgrade/DistUpgradeQuirks.py:237
4174+#: ../DistUpgrade/DistUpgradeQuirks.py:238
4175 msgid ""
4176 "Running the 'unity' desktop environment is not fully supported by your "
4177 "graphics hardware. You will maybe end up in a very slow environment after "
4178@@ -931,11 +935,11 @@ msgid ""
4179 "upgrade?"
4180 msgstr ""
4181
4182-#: ../DistUpgrade/DistUpgradeQuirks.py:261
4183+#: ../DistUpgrade/DistUpgradeQuirks.py:262
4184 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
4185 msgstr ""
4186
4187-#: ../DistUpgrade/DistUpgradeQuirks.py:263
4188+#: ../DistUpgrade/DistUpgradeQuirks.py:264
4189 msgid ""
4190 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
4191 "and you may encounter problems after the upgrade. For more information see "
4192@@ -943,13 +947,13 @@ msgid ""
4193 "continue with the upgrade?"
4194 msgstr ""
4195
4196-#: ../DistUpgrade/DistUpgradeQuirks.py:283
4197+#: ../DistUpgrade/DistUpgradeQuirks.py:284
4198 msgid ""
4199 "Upgrading may reduce desktop effects, and performance in games and other "
4200 "graphically intensive programs."
4201 msgstr ""
4202
4203-#: ../DistUpgrade/DistUpgradeQuirks.py:287
4204+#: ../DistUpgrade/DistUpgradeQuirks.py:288
4205 msgid ""
4206 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
4207 "of this driver is available that works with your hardware in Ubuntu 10.04 "
4208@@ -958,12 +962,12 @@ msgid ""
4209 "Do you want to continue?"
4210 msgstr ""
4211
4212-#: ../DistUpgrade/DistUpgradeQuirks.py:326
4213-#: ../DistUpgrade/DistUpgradeQuirks.py:395
4214+#: ../DistUpgrade/DistUpgradeQuirks.py:327
4215+#: ../DistUpgrade/DistUpgradeQuirks.py:396
4216 msgid "Sorry, no more upgrades for this system"
4217 msgstr ""
4218
4219-#: ../DistUpgrade/DistUpgradeQuirks.py:327
4220+#: ../DistUpgrade/DistUpgradeQuirks.py:328
4221 #, python-format
4222 msgid ""
4223 "There will not be any further Ubuntu releases for this system's 'i386' "
4224@@ -972,11 +976,11 @@ msgid ""
4225 "Updates for Ubuntu %s will continue until %s."
4226 msgstr ""
4227
4228-#: ../DistUpgrade/DistUpgradeQuirks.py:342
4229+#: ../DistUpgrade/DistUpgradeQuirks.py:343
4230 msgid "No ARMv6 CPU"
4231 msgstr ""
4232
4233-#: ../DistUpgrade/DistUpgradeQuirks.py:343
4234+#: ../DistUpgrade/DistUpgradeQuirks.py:344
4235 msgid ""
4236 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
4237 "packages in karmic were built with optimizations requiring ARMv6 as the "
4238@@ -984,12 +988,12 @@ msgid ""
4239 "Ubuntu release with this hardware."
4240 msgstr ""
4241
4242-#: ../DistUpgrade/DistUpgradeQuirks.py:363
4243+#: ../DistUpgrade/DistUpgradeQuirks.py:364
4244 msgid ""
4245 "Sorry, this storage driver is not supported in kernels for newer releases"
4246 msgstr ""
4247
4248-#: ../DistUpgrade/DistUpgradeQuirks.py:365
4249+#: ../DistUpgrade/DistUpgradeQuirks.py:366
4250 #, python-format
4251 msgid ""
4252 "There will not be any further Ubuntu releases that provide kernel support "
4253@@ -999,7 +1003,7 @@ msgid ""
4254 "driver, remove the directory %s and try again."
4255 msgstr ""
4256
4257-#: ../DistUpgrade/DistUpgradeQuirks.py:396
4258+#: ../DistUpgrade/DistUpgradeQuirks.py:397
4259 #, python-format
4260 msgid ""
4261 "There will not be any further Ubuntu releases for this system's POWER8 "
4262@@ -1008,11 +1012,11 @@ msgid ""
4263 "Updates for Ubuntu %s will continue until %s."
4264 msgstr ""
4265
4266-#: ../DistUpgrade/DistUpgradeQuirks.py:414
4267+#: ../DistUpgrade/DistUpgradeQuirks.py:415
4268 msgid "No init available"
4269 msgstr ""
4270
4271-#: ../DistUpgrade/DistUpgradeQuirks.py:415
4272+#: ../DistUpgrade/DistUpgradeQuirks.py:416
4273 msgid ""
4274 "Your system appears to be a virtualised environment without an init daemon, "
4275 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
4276@@ -1022,11 +1026,11 @@ msgid ""
4277 "Are you sure you want to continue?"
4278 msgstr ""
4279
4280-#: ../DistUpgrade/DistUpgradeQuirks.py:456
4281+#: ../DistUpgrade/DistUpgradeQuirks.py:457
4282 msgid "The Robot Operating System (ROS) is installed"
4283 msgstr ""
4284
4285-#: ../DistUpgrade/DistUpgradeQuirks.py:457
4286+#: ../DistUpgrade/DistUpgradeQuirks.py:458
4287 msgid ""
4288 "It appears that ROS is currently installed. Each ROS release is very strict "
4289 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
4290@@ -1043,11 +1047,11 @@ msgid ""
4291 "Are you sure you want to continue?"
4292 msgstr ""
4293
4294-#: ../DistUpgrade/DistUpgradeQuirks.py:582
4295+#: ../DistUpgrade/DistUpgradeQuirks.py:583
4296 msgid "Connection to the Snap Store failed"
4297 msgstr ""
4298
4299-#: ../DistUpgrade/DistUpgradeQuirks.py:583
4300+#: ../DistUpgrade/DistUpgradeQuirks.py:584
4301 msgid ""
4302 "You have the package lxd installed but your system is unable to reach the "
4303 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
4304@@ -1057,11 +1061,11 @@ msgid ""
4305 "may want to configure a Snap Store proxy."
4306 msgstr ""
4307
4308-#: ../DistUpgrade/DistUpgradeQuirks.py:598
4309+#: ../DistUpgrade/DistUpgradeQuirks.py:599
4310 msgid "Connection to Snap Store failed"
4311 msgstr ""
4312
4313-#: ../DistUpgrade/DistUpgradeQuirks.py:599
4314+#: ../DistUpgrade/DistUpgradeQuirks.py:600
4315 msgid ""
4316 "Your system does not have a connection to the Snap Store. For the best "
4317 "upgrade experience make sure that your system can connect to api.snapcraft."
4318@@ -1069,11 +1073,11 @@ msgid ""
4319 "Do you still want to continue with the upgrade?"
4320 msgstr ""
4321
4322-#: ../DistUpgrade/DistUpgradeQuirks.py:608
4323+#: ../DistUpgrade/DistUpgradeQuirks.py:609
4324 msgid "Outdated snapd package"
4325 msgstr ""
4326
4327-#: ../DistUpgrade/DistUpgradeQuirks.py:609
4328+#: ../DistUpgrade/DistUpgradeQuirks.py:610
4329 msgid ""
4330 "Your system does not have the latest version of snapd. Please update the "
4331 "version of snapd on your system to improve the upgrade experience.\n"
4332@@ -1082,34 +1086,34 @@ msgstr ""
4333
4334 #. now perform direct API calls to the store, requesting size
4335 #. information for each of the snaps needing installation
4336-#: ../DistUpgrade/DistUpgradeQuirks.py:634
4337+#: ../DistUpgrade/DistUpgradeQuirks.py:635
4338 msgid "Calculating snap size requirements"
4339 msgstr ""
4340
4341-#: ../DistUpgrade/DistUpgradeQuirks.py:665
4342+#: ../DistUpgrade/DistUpgradeQuirks.py:666
4343 msgid "Processing snap replacements"
4344 msgstr ""
4345
4346-#: ../DistUpgrade/DistUpgradeQuirks.py:671
4347+#: ../DistUpgrade/DistUpgradeQuirks.py:672
4348 #, python-format
4349 msgid "refreshing snap %s"
4350 msgstr ""
4351
4352-#: ../DistUpgrade/DistUpgradeQuirks.py:675
4353+#: ../DistUpgrade/DistUpgradeQuirks.py:676
4354 #, python-format
4355 msgid "removing snap %s"
4356 msgstr ""
4357
4358-#: ../DistUpgrade/DistUpgradeQuirks.py:678
4359+#: ../DistUpgrade/DistUpgradeQuirks.py:679
4360 #, python-format
4361 msgid "installing snap %s"
4362 msgstr ""
4363
4364-#: ../DistUpgrade/DistUpgradeQuirks.py:707
4365+#: ../DistUpgrade/DistUpgradeQuirks.py:708
4366 msgid "PAE not enabled"
4367 msgstr ""
4368
4369-#: ../DistUpgrade/DistUpgradeQuirks.py:708
4370+#: ../DistUpgrade/DistUpgradeQuirks.py:709
4371 msgid ""
4372 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
4373 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
4374@@ -1117,11 +1121,11 @@ msgid ""
4375 "http://help.ubuntu.com/community/EnablingPAE"
4376 msgstr ""
4377
4378-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
4379+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
4380 msgid "universe component not enabled"
4381 msgstr ""
4382
4383-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
4384+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
4385 #, python-format
4386 msgid ""
4387 "You have the package %s installed which is a python2 package. python2 has "
4388@@ -1133,7 +1137,7 @@ msgid ""
4389 "universe component in /etc/apt/sources.list or remove %s"
4390 msgstr ""
4391
4392-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
4393+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
4394 msgid "Checking for installed snaps"
4395 msgstr ""
4396
4397diff --git a/po/ceb.po b/po/ceb.po
4398index 81ae5fb..59862b8 100644
4399--- a/po/ceb.po
4400+++ b/po/ceb.po
4401@@ -8,7 +8,11 @@ msgid ""
4402 msgstr ""
4403 "Project-Id-Version: update-manager\n"
4404 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
4405+<<<<<<< po/ceb.po
4406 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
4407+=======
4408+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
4409+>>>>>>> po/ceb.po
4410 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
4411 "Last-Translator: James Banogon <james@banogon.com>\n"
4412 "Language-Team: Cebuano <ceb@li.org>\n"
4413@@ -878,11 +882,11 @@ msgstr ""
4414 msgid "Media Change"
4415 msgstr ""
4416
4417-#: ../DistUpgrade/DistUpgradeQuirks.py:235
4418+#: ../DistUpgrade/DistUpgradeQuirks.py:236
4419 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
4420 msgstr ""
4421
4422-#: ../DistUpgrade/DistUpgradeQuirks.py:237
4423+#: ../DistUpgrade/DistUpgradeQuirks.py:238
4424 msgid ""
4425 "Running the 'unity' desktop environment is not fully supported by your "
4426 "graphics hardware. You will maybe end up in a very slow environment after "
4427@@ -892,11 +896,11 @@ msgid ""
4428 "upgrade?"
4429 msgstr ""
4430
4431-#: ../DistUpgrade/DistUpgradeQuirks.py:261
4432+#: ../DistUpgrade/DistUpgradeQuirks.py:262
4433 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
4434 msgstr ""
4435
4436-#: ../DistUpgrade/DistUpgradeQuirks.py:263
4437+#: ../DistUpgrade/DistUpgradeQuirks.py:264
4438 msgid ""
4439 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
4440 "and you may encounter problems after the upgrade. For more information see "
4441@@ -904,13 +908,13 @@ msgid ""
4442 "continue with the upgrade?"
4443 msgstr ""
4444
4445-#: ../DistUpgrade/DistUpgradeQuirks.py:283
4446+#: ../DistUpgrade/DistUpgradeQuirks.py:284
4447 msgid ""
4448 "Upgrading may reduce desktop effects, and performance in games and other "
4449 "graphically intensive programs."
4450 msgstr ""
4451
4452-#: ../DistUpgrade/DistUpgradeQuirks.py:287
4453+#: ../DistUpgrade/DistUpgradeQuirks.py:288
4454 msgid ""
4455 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
4456 "of this driver is available that works with your hardware in Ubuntu 10.04 "
4457@@ -919,12 +923,12 @@ msgid ""
4458 "Do you want to continue?"
4459 msgstr ""
4460
4461-#: ../DistUpgrade/DistUpgradeQuirks.py:326
4462-#: ../DistUpgrade/DistUpgradeQuirks.py:395
4463+#: ../DistUpgrade/DistUpgradeQuirks.py:327
4464+#: ../DistUpgrade/DistUpgradeQuirks.py:396
4465 msgid "Sorry, no more upgrades for this system"
4466 msgstr ""
4467
4468-#: ../DistUpgrade/DistUpgradeQuirks.py:327
4469+#: ../DistUpgrade/DistUpgradeQuirks.py:328
4470 #, python-format
4471 msgid ""
4472 "There will not be any further Ubuntu releases for this system's 'i386' "
4473@@ -933,11 +937,11 @@ msgid ""
4474 "Updates for Ubuntu %s will continue until %s."
4475 msgstr ""
4476
4477-#: ../DistUpgrade/DistUpgradeQuirks.py:342
4478+#: ../DistUpgrade/DistUpgradeQuirks.py:343
4479 msgid "No ARMv6 CPU"
4480 msgstr ""
4481
4482-#: ../DistUpgrade/DistUpgradeQuirks.py:343
4483+#: ../DistUpgrade/DistUpgradeQuirks.py:344
4484 msgid ""
4485 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
4486 "packages in karmic were built with optimizations requiring ARMv6 as the "
4487@@ -945,12 +949,12 @@ msgid ""
4488 "Ubuntu release with this hardware."
4489 msgstr ""
4490
4491-#: ../DistUpgrade/DistUpgradeQuirks.py:363
4492+#: ../DistUpgrade/DistUpgradeQuirks.py:364
4493 msgid ""
4494 "Sorry, this storage driver is not supported in kernels for newer releases"
4495 msgstr ""
4496
4497-#: ../DistUpgrade/DistUpgradeQuirks.py:365
4498+#: ../DistUpgrade/DistUpgradeQuirks.py:366
4499 #, python-format
4500 msgid ""
4501 "There will not be any further Ubuntu releases that provide kernel support "
4502@@ -960,7 +964,7 @@ msgid ""
4503 "driver, remove the directory %s and try again."
4504 msgstr ""
4505
4506-#: ../DistUpgrade/DistUpgradeQuirks.py:396
4507+#: ../DistUpgrade/DistUpgradeQuirks.py:397
4508 #, python-format
4509 msgid ""
4510 "There will not be any further Ubuntu releases for this system's POWER8 "
4511@@ -969,11 +973,11 @@ msgid ""
4512 "Updates for Ubuntu %s will continue until %s."
4513 msgstr ""
4514
4515-#: ../DistUpgrade/DistUpgradeQuirks.py:414
4516+#: ../DistUpgrade/DistUpgradeQuirks.py:415
4517 msgid "No init available"
4518 msgstr ""
4519
4520-#: ../DistUpgrade/DistUpgradeQuirks.py:415
4521+#: ../DistUpgrade/DistUpgradeQuirks.py:416
4522 msgid ""
4523 "Your system appears to be a virtualised environment without an init daemon, "
4524 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
4525@@ -983,11 +987,11 @@ msgid ""
4526 "Are you sure you want to continue?"
4527 msgstr ""
4528
4529-#: ../DistUpgrade/DistUpgradeQuirks.py:456
4530+#: ../DistUpgrade/DistUpgradeQuirks.py:457
4531 msgid "The Robot Operating System (ROS) is installed"
4532 msgstr ""
4533
4534-#: ../DistUpgrade/DistUpgradeQuirks.py:457
4535+#: ../DistUpgrade/DistUpgradeQuirks.py:458
4536 msgid ""
4537 "It appears that ROS is currently installed. Each ROS release is very strict "
4538 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
4539@@ -1004,11 +1008,11 @@ msgid ""
4540 "Are you sure you want to continue?"
4541 msgstr ""
4542
4543-#: ../DistUpgrade/DistUpgradeQuirks.py:582
4544+#: ../DistUpgrade/DistUpgradeQuirks.py:583
4545 msgid "Connection to the Snap Store failed"
4546 msgstr ""
4547
4548-#: ../DistUpgrade/DistUpgradeQuirks.py:583
4549+#: ../DistUpgrade/DistUpgradeQuirks.py:584
4550 msgid ""
4551 "You have the package lxd installed but your system is unable to reach the "
4552 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
4553@@ -1018,11 +1022,11 @@ msgid ""
4554 "may want to configure a Snap Store proxy."
4555 msgstr ""
4556
4557-#: ../DistUpgrade/DistUpgradeQuirks.py:598
4558+#: ../DistUpgrade/DistUpgradeQuirks.py:599
4559 msgid "Connection to Snap Store failed"
4560 msgstr ""
4561
4562-#: ../DistUpgrade/DistUpgradeQuirks.py:599
4563+#: ../DistUpgrade/DistUpgradeQuirks.py:600
4564 msgid ""
4565 "Your system does not have a connection to the Snap Store. For the best "
4566 "upgrade experience make sure that your system can connect to api.snapcraft."
4567@@ -1030,11 +1034,11 @@ msgid ""
4568 "Do you still want to continue with the upgrade?"
4569 msgstr ""
4570
4571-#: ../DistUpgrade/DistUpgradeQuirks.py:608
4572+#: ../DistUpgrade/DistUpgradeQuirks.py:609
4573 msgid "Outdated snapd package"
4574 msgstr ""
4575
4576-#: ../DistUpgrade/DistUpgradeQuirks.py:609
4577+#: ../DistUpgrade/DistUpgradeQuirks.py:610
4578 msgid ""
4579 "Your system does not have the latest version of snapd. Please update the "
4580 "version of snapd on your system to improve the upgrade experience.\n"
4581@@ -1043,34 +1047,34 @@ msgstr ""
4582
4583 #. now perform direct API calls to the store, requesting size
4584 #. information for each of the snaps needing installation
4585-#: ../DistUpgrade/DistUpgradeQuirks.py:634
4586+#: ../DistUpgrade/DistUpgradeQuirks.py:635
4587 msgid "Calculating snap size requirements"
4588 msgstr ""
4589
4590-#: ../DistUpgrade/DistUpgradeQuirks.py:665
4591+#: ../DistUpgrade/DistUpgradeQuirks.py:666
4592 msgid "Processing snap replacements"
4593 msgstr ""
4594
4595-#: ../DistUpgrade/DistUpgradeQuirks.py:671
4596+#: ../DistUpgrade/DistUpgradeQuirks.py:672
4597 #, python-format
4598 msgid "refreshing snap %s"
4599 msgstr ""
4600
4601-#: ../DistUpgrade/DistUpgradeQuirks.py:675
4602+#: ../DistUpgrade/DistUpgradeQuirks.py:676
4603 #, python-format
4604 msgid "removing snap %s"
4605 msgstr ""
4606
4607-#: ../DistUpgrade/DistUpgradeQuirks.py:678
4608+#: ../DistUpgrade/DistUpgradeQuirks.py:679
4609 #, python-format
4610 msgid "installing snap %s"
4611 msgstr ""
4612
4613-#: ../DistUpgrade/DistUpgradeQuirks.py:707
4614+#: ../DistUpgrade/DistUpgradeQuirks.py:708
4615 msgid "PAE not enabled"
4616 msgstr ""
4617
4618-#: ../DistUpgrade/DistUpgradeQuirks.py:708
4619+#: ../DistUpgrade/DistUpgradeQuirks.py:709
4620 msgid ""
4621 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
4622 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
4623@@ -1078,11 +1082,11 @@ msgid ""
4624 "http://help.ubuntu.com/community/EnablingPAE"
4625 msgstr ""
4626
4627-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
4628+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
4629 msgid "universe component not enabled"
4630 msgstr ""
4631
4632-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
4633+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
4634 #, python-format
4635 msgid ""
4636 "You have the package %s installed which is a python2 package. python2 has "
4637@@ -1094,7 +1098,7 @@ msgid ""
4638 "universe component in /etc/apt/sources.list or remove %s"
4639 msgstr ""
4640
4641-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
4642+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
4643 msgid "Checking for installed snaps"
4644 msgstr ""
4645
4646diff --git a/po/ckb.po b/po/ckb.po
4647index 0cec478..6a4285d 100644
4648--- a/po/ckb.po
4649+++ b/po/ckb.po
4650@@ -8,7 +8,11 @@ msgid ""
4651 msgstr ""
4652 "Project-Id-Version: update-manager\n"
4653 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
4654+<<<<<<< po/ckb.po
4655 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
4656+=======
4657+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
4658+>>>>>>> po/ckb.po
4659 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
4660 "Last-Translator: jwtear nariman <jwtiyar@gmail.com>\n"
4661 "Language-Team: Kurdish (Sorani) <ckb@li.org>\n"
4662@@ -883,11 +887,11 @@ msgstr ""
4663 msgid "Media Change"
4664 msgstr ""
4665
4666-#: ../DistUpgrade/DistUpgradeQuirks.py:235
4667+#: ../DistUpgrade/DistUpgradeQuirks.py:236
4668 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
4669 msgstr ""
4670
4671-#: ../DistUpgrade/DistUpgradeQuirks.py:237
4672+#: ../DistUpgrade/DistUpgradeQuirks.py:238
4673 msgid ""
4674 "Running the 'unity' desktop environment is not fully supported by your "
4675 "graphics hardware. You will maybe end up in a very slow environment after "
4676@@ -897,11 +901,11 @@ msgid ""
4677 "upgrade?"
4678 msgstr ""
4679
4680-#: ../DistUpgrade/DistUpgradeQuirks.py:261
4681+#: ../DistUpgrade/DistUpgradeQuirks.py:262
4682 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
4683 msgstr ""
4684
4685-#: ../DistUpgrade/DistUpgradeQuirks.py:263
4686+#: ../DistUpgrade/DistUpgradeQuirks.py:264
4687 msgid ""
4688 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
4689 "and you may encounter problems after the upgrade. For more information see "
4690@@ -909,13 +913,13 @@ msgid ""
4691 "continue with the upgrade?"
4692 msgstr ""
4693
4694-#: ../DistUpgrade/DistUpgradeQuirks.py:283
4695+#: ../DistUpgrade/DistUpgradeQuirks.py:284
4696 msgid ""
4697 "Upgrading may reduce desktop effects, and performance in games and other "
4698 "graphically intensive programs."
4699 msgstr ""
4700
4701-#: ../DistUpgrade/DistUpgradeQuirks.py:287
4702+#: ../DistUpgrade/DistUpgradeQuirks.py:288
4703 msgid ""
4704 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
4705 "of this driver is available that works with your hardware in Ubuntu 10.04 "
4706@@ -924,12 +928,12 @@ msgid ""
4707 "Do you want to continue?"
4708 msgstr ""
4709
4710-#: ../DistUpgrade/DistUpgradeQuirks.py:326
4711-#: ../DistUpgrade/DistUpgradeQuirks.py:395
4712+#: ../DistUpgrade/DistUpgradeQuirks.py:327
4713+#: ../DistUpgrade/DistUpgradeQuirks.py:396
4714 msgid "Sorry, no more upgrades for this system"
4715 msgstr ""
4716
4717-#: ../DistUpgrade/DistUpgradeQuirks.py:327
4718+#: ../DistUpgrade/DistUpgradeQuirks.py:328
4719 #, python-format
4720 msgid ""
4721 "There will not be any further Ubuntu releases for this system's 'i386' "
4722@@ -938,11 +942,11 @@ msgid ""
4723 "Updates for Ubuntu %s will continue until %s."
4724 msgstr ""
4725
4726-#: ../DistUpgrade/DistUpgradeQuirks.py:342
4727+#: ../DistUpgrade/DistUpgradeQuirks.py:343
4728 msgid "No ARMv6 CPU"
4729 msgstr ""
4730
4731-#: ../DistUpgrade/DistUpgradeQuirks.py:343
4732+#: ../DistUpgrade/DistUpgradeQuirks.py:344
4733 msgid ""
4734 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
4735 "packages in karmic were built with optimizations requiring ARMv6 as the "
4736@@ -950,12 +954,12 @@ msgid ""
4737 "Ubuntu release with this hardware."
4738 msgstr ""
4739
4740-#: ../DistUpgrade/DistUpgradeQuirks.py:363
4741+#: ../DistUpgrade/DistUpgradeQuirks.py:364
4742 msgid ""
4743 "Sorry, this storage driver is not supported in kernels for newer releases"
4744 msgstr ""
4745
4746-#: ../DistUpgrade/DistUpgradeQuirks.py:365
4747+#: ../DistUpgrade/DistUpgradeQuirks.py:366
4748 #, python-format
4749 msgid ""
4750 "There will not be any further Ubuntu releases that provide kernel support "
4751@@ -965,7 +969,7 @@ msgid ""
4752 "driver, remove the directory %s and try again."
4753 msgstr ""
4754
4755-#: ../DistUpgrade/DistUpgradeQuirks.py:396
4756+#: ../DistUpgrade/DistUpgradeQuirks.py:397
4757 #, python-format
4758 msgid ""
4759 "There will not be any further Ubuntu releases for this system's POWER8 "
4760@@ -974,11 +978,11 @@ msgid ""
4761 "Updates for Ubuntu %s will continue until %s."
4762 msgstr ""
4763
4764-#: ../DistUpgrade/DistUpgradeQuirks.py:414
4765+#: ../DistUpgrade/DistUpgradeQuirks.py:415
4766 msgid "No init available"
4767 msgstr ""
4768
4769-#: ../DistUpgrade/DistUpgradeQuirks.py:415
4770+#: ../DistUpgrade/DistUpgradeQuirks.py:416
4771 msgid ""
4772 "Your system appears to be a virtualised environment without an init daemon, "
4773 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
4774@@ -988,11 +992,11 @@ msgid ""
4775 "Are you sure you want to continue?"
4776 msgstr ""
4777
4778-#: ../DistUpgrade/DistUpgradeQuirks.py:456
4779+#: ../DistUpgrade/DistUpgradeQuirks.py:457
4780 msgid "The Robot Operating System (ROS) is installed"
4781 msgstr ""
4782
4783-#: ../DistUpgrade/DistUpgradeQuirks.py:457
4784+#: ../DistUpgrade/DistUpgradeQuirks.py:458
4785 msgid ""
4786 "It appears that ROS is currently installed. Each ROS release is very strict "
4787 "about the versions of Ubuntu it supports, and Ubuntu upgrades can fail if "
4788@@ -1009,11 +1013,11 @@ msgid ""
4789 "Are you sure you want to continue?"
4790 msgstr ""
4791
4792-#: ../DistUpgrade/DistUpgradeQuirks.py:582
4793+#: ../DistUpgrade/DistUpgradeQuirks.py:583
4794 msgid "Connection to the Snap Store failed"
4795 msgstr ""
4796
4797-#: ../DistUpgrade/DistUpgradeQuirks.py:583
4798+#: ../DistUpgrade/DistUpgradeQuirks.py:584
4799 msgid ""
4800 "You have the package lxd installed but your system is unable to reach the "
4801 "Snap Store. lxd is now provided via a snap and the release upgrade will fail "
4802@@ -1023,11 +1027,11 @@ msgid ""
4803 "may want to configure a Snap Store proxy."
4804 msgstr ""
4805
4806-#: ../DistUpgrade/DistUpgradeQuirks.py:598
4807+#: ../DistUpgrade/DistUpgradeQuirks.py:599
4808 msgid "Connection to Snap Store failed"
4809 msgstr ""
4810
4811-#: ../DistUpgrade/DistUpgradeQuirks.py:599
4812+#: ../DistUpgrade/DistUpgradeQuirks.py:600
4813 msgid ""
4814 "Your system does not have a connection to the Snap Store. For the best "
4815 "upgrade experience make sure that your system can connect to api.snapcraft."
4816@@ -1035,11 +1039,11 @@ msgid ""
4817 "Do you still want to continue with the upgrade?"
4818 msgstr ""
4819
4820-#: ../DistUpgrade/DistUpgradeQuirks.py:608
4821+#: ../DistUpgrade/DistUpgradeQuirks.py:609
4822 msgid "Outdated snapd package"
4823 msgstr ""
4824
4825-#: ../DistUpgrade/DistUpgradeQuirks.py:609
4826+#: ../DistUpgrade/DistUpgradeQuirks.py:610
4827 msgid ""
4828 "Your system does not have the latest version of snapd. Please update the "
4829 "version of snapd on your system to improve the upgrade experience.\n"
4830@@ -1048,34 +1052,34 @@ msgstr ""
4831
4832 #. now perform direct API calls to the store, requesting size
4833 #. information for each of the snaps needing installation
4834-#: ../DistUpgrade/DistUpgradeQuirks.py:634
4835+#: ../DistUpgrade/DistUpgradeQuirks.py:635
4836 msgid "Calculating snap size requirements"
4837 msgstr ""
4838
4839-#: ../DistUpgrade/DistUpgradeQuirks.py:665
4840+#: ../DistUpgrade/DistUpgradeQuirks.py:666
4841 msgid "Processing snap replacements"
4842 msgstr ""
4843
4844-#: ../DistUpgrade/DistUpgradeQuirks.py:671
4845+#: ../DistUpgrade/DistUpgradeQuirks.py:672
4846 #, python-format
4847 msgid "refreshing snap %s"
4848 msgstr ""
4849
4850-#: ../DistUpgrade/DistUpgradeQuirks.py:675
4851+#: ../DistUpgrade/DistUpgradeQuirks.py:676
4852 #, python-format
4853 msgid "removing snap %s"
4854 msgstr ""
4855
4856-#: ../DistUpgrade/DistUpgradeQuirks.py:678
4857+#: ../DistUpgrade/DistUpgradeQuirks.py:679
4858 #, python-format
4859 msgid "installing snap %s"
4860 msgstr ""
4861
4862-#: ../DistUpgrade/DistUpgradeQuirks.py:707
4863+#: ../DistUpgrade/DistUpgradeQuirks.py:708
4864 msgid "PAE not enabled"
4865 msgstr ""
4866
4867-#: ../DistUpgrade/DistUpgradeQuirks.py:708
4868+#: ../DistUpgrade/DistUpgradeQuirks.py:709
4869 msgid ""
4870 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
4871 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
4872@@ -1083,11 +1087,11 @@ msgid ""
4873 "http://help.ubuntu.com/community/EnablingPAE"
4874 msgstr ""
4875
4876-#: ../DistUpgrade/DistUpgradeQuirks.py:1004
4877+#: ../DistUpgrade/DistUpgradeQuirks.py:1005
4878 msgid "universe component not enabled"
4879 msgstr ""
4880
4881-#: ../DistUpgrade/DistUpgradeQuirks.py:1005
4882+#: ../DistUpgrade/DistUpgradeQuirks.py:1006
4883 #, python-format
4884 msgid ""
4885 "You have the package %s installed which is a python2 package. python2 has "
4886@@ -1099,7 +1103,7 @@ msgid ""
4887 "universe component in /etc/apt/sources.list or remove %s"
4888 msgstr ""
4889
4890-#: ../DistUpgrade/DistUpgradeQuirks.py:1117
4891+#: ../DistUpgrade/DistUpgradeQuirks.py:1118
4892 msgid "Checking for installed snaps"
4893 msgstr ""
4894
4895diff --git a/po/crh.po b/po/crh.po
4896index 1ce6c5e..45f6996 100644
4897--- a/po/crh.po
4898+++ b/po/crh.po
4899@@ -8,7 +8,11 @@ msgid ""
4900 msgstr ""
4901 "Project-Id-Version: update-manager\n"
4902 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
4903+<<<<<<< po/crh.po
4904 "POT-Creation-Date: 2022-07-15 14:26-0700\n"
4905+=======
4906+"POT-Creation-Date: 2022-07-19 06:39-0700\n"
4907+>>>>>>> po/crh.po
4908 "PO-Revision-Date: 2013-05-22 11:00+0000\n"
4909 "Last-Translator: Reşat SABIQ <tilde.birlik@gmail.com>\n"
4910 "Language-Team: QIRIMTATARCA (Qırım Türkçesi) <tilde-birlik-tercime@lists."
4911@@ -1008,11 +1012,11 @@ msgstr "Lütfen \"%2s\" sürücüsüne \"%1s\" takın"
4912 msgid "Media Change"
4913 msgstr "Vasat Deñişimi"
4914
4915-#: ../DistUpgrade/DistUpgradeQuirks.py:235
4916+#: ../DistUpgrade/DistUpgradeQuirks.py:236
4917 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
4918 msgstr ""
4919
4920-#: ../DistUpgrade/DistUpgradeQuirks.py:237
4921+#: ../DistUpgrade/DistUpgradeQuirks.py:238
4922 msgid ""
4923 "Running the 'unity' desktop environment is not fully supported by your "
4924 "graphics hardware. You will maybe end up in a very slow environment after "
4925@@ -1022,11 +1026,11 @@ msgid ""
4926 "upgrade?"
4927 msgstr ""
4928
4929-#: ../DistUpgrade/DistUpgradeQuirks.py:261
4930+#: ../DistUpgrade/DistUpgradeQuirks.py:262
4931 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
4932 msgstr ""
4933
4934-#: ../DistUpgrade/DistUpgradeQuirks.py:263
4935+#: ../DistUpgrade/DistUpgradeQuirks.py:264
4936 msgid ""
4937 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
4938 "and you may encounter problems after the upgrade. For more information see "
4939@@ -1035,7 +1039,7 @@ msgid ""
4940 msgstr ""
4941
4942 # tr
4943-#: ../DistUpgrade/DistUpgradeQuirks.py:283
4944+#: ../DistUpgrade/DistUpgradeQuirks.py:284
4945 msgid ""
4946 "Upgrading may reduce desktop effects, and performance in games and other "
4947 "graphically intensive programs."
4948@@ -1044,7 +1048,7 @@ msgstr ""
4949 "uygulamaların başarımını düşürebilir."
4950
4951 # tr
4952-#: ../DistUpgrade/DistUpgradeQuirks.py:287
4953+#: ../DistUpgrade/DistUpgradeQuirks.py:288
4954 msgid ""
4955 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
4956 "of this driver is available that works with your hardware in Ubuntu 10.04 "
4957@@ -1057,12 +1061,12 @@ msgstr ""
4958 "\n"
4959 "Devam etmege isteysiñizmi?"
4960
4961-#: ../DistUpgrade/DistUpgradeQuirks.py:326
4962-#: ../DistUpgrade/DistUpgradeQuirks.py:395
4963+#: ../DistUpgrade/DistUpgradeQuirks.py:327
4964+#: ../DistUpgrade/DistUpgradeQuirks.py:396
4965 msgid "Sorry, no more upgrades for this system"
4966 msgstr ""
4967
4968-#: ../DistUpgrade/DistUpgradeQuirks.py:327
4969+#: ../DistUpgrade/DistUpgradeQuirks.py:328
4970 #, python-format
4971 msgid ""
4972 "There will not be any further Ubuntu releases for this system's 'i386' "
4973@@ -1072,12 +1076,12 @@ msgid ""
4974 msgstr ""
4975
4976 # tr
4977-#: ../DistUpgrade/DistUpgradeQuirks.py:342
4978+#: ../DistUpgrade/DistUpgradeQuirks.py:343
4979 msgid "No ARMv6 CPU"
4980 msgstr "ARMv6 İşlemci Yok"
4981
4982 # tr
4983-#: ../DistUpgrade/DistUpgradeQuirks.py:343
4984+#: ../DistUpgrade/DistUpgradeQuirks.py:344
4985 msgid ""
4986 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
4987 "packages in karmic were built with optimizations requiring ARMv6 as the "
4988@@ -1089,12 +1093,12 @@ msgstr ""
4989 "ile oluşturulmuştur. Bu donanım ile, sisteminizi yeni bir Ubuntu sürümüne "
4990 "yükseltmek mümkün değil."
4991
4992-#: ../DistUpgrade/DistUpgradeQuirks.py:363
4993+#: ../DistUpgrade/DistUpgradeQuirks.py:364
4994 msgid ""
4995 "Sorry, this storage driver is not supported in kernels for newer releases"
4996 msgstr ""
4997
4998-#: ../DistUpgrade/DistUpgradeQuirks.py:365
4999+#: ../DistUpgrade/DistUpgradeQuirks.py:366
5000 #, python-format
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches