Ubuntu
ubuntu-release-upgrader package

Merge lp:ubuntu/trusty-proposed/ubuntu-release-upgrader into lp:ubuntu/trusty/ubuntu-release-upgrader

  1. Trusty (14.04)
  2. trusty-proposed
  3. Merge into trusty
Proposed by Imran Shah
Status: Needs review
Proposed branch: lp:ubuntu/trusty-proposed/ubuntu-release-upgrader
Merge into: lp:ubuntu/trusty/ubuntu-release-upgrader
Diff against target: 81663 lines (+14939/-14920)
130 files modified
DistUpgrade/DistUpgradeApport.py (+8/-10)
DistUpgrade/DistUpgradeCache.py (+18/-4)
DistUpgrade/DistUpgradeMain.py (+1/-0)
DistUpgrade/DistUpgradeVersion.py (+1/-1)
DistUpgrade/DistUpgradeView.py (+6/-0)
DistUpgrade/DistUpgradeViewGtk3.py (+18/-9)
DistUpgrade/DistUpgradeViewText.py (+13/-4)
DistUpgrade/build-tarball.sh (+3/-3)
data/mirrors.cfg (+152/-0)
data/removal_blacklist.cfg (+1/-1)
debian/changelog (+64/-0)
po/af.po (+124/-126)
po/am.po (+125/-127)
po/an.po (+126/-128)
po/ar.po (+122/-124)
po/ast.po (+119/-121)
po/az.po (+124/-126)
po/be.po (+125/-127)
po/bg.po (+122/-124)
po/bn.po (+119/-121)
po/bo.po (+122/-124)
po/br.po (+124/-126)
po/bs.po (+119/-121)
po/ca.po (+122/-124)
po/ca@valencia.po (+135/-131)
po/ceb.po (+129/-131)
po/ckb.po (+126/-128)
po/crh.po (+122/-124)
po/cs.po (+122/-124)
po/csb.po (+124/-126)
po/cv.po (+129/-131)
po/cy.po (+127/-129)
po/da.po (+119/-121)
po/de.po (+119/-121)
po/dv.po (+126/-128)
po/el.po (+122/-124)
po/en_AU.po (+153/-155)
po/en_CA.po (+153/-155)
po/en_GB.po (+139/-141)
po/eo.po (+120/-122)
po/es.po (+122/-124)
po/et.po (+125/-127)
po/eu.po (+122/-124)
po/fa.po (+129/-131)
po/fi.po (+121/-123)
po/fil.po (+127/-129)
po/fo.po (+126/-128)
po/fr.po (+122/-124)
po/fr_CA.po (+122/-124)
po/fur.po (+127/-129)
po/fy.po (+126/-128)
po/ga.po (+129/-131)
po/gd.po (+119/-121)
po/gl.po (+122/-124)
po/gu.po (+129/-131)
po/gv.po (+129/-131)
po/he.po (+119/-121)
po/hi.po (+122/-124)
po/hr.po (+119/-121)
po/hu.po (+122/-124)
po/hy.po (+129/-131)
po/id.po (+123/-125)
po/is.po (+127/-129)
po/it.po (+123/-125)
po/ja.po (+119/-121)
po/jv.po (+129/-131)
po/ka.po (+124/-126)
po/kk.po (+125/-127)
po/km.po (+122/-124)
po/kn.po (+126/-128)
po/ko.po (+119/-121)
po/ku.po (+124/-126)
po/ky.po (+129/-131)
po/lb.po (+129/-131)
po/lo.po (+129/-131)
po/lt.po (+119/-121)
po/lv.po (+119/-121)
po/mhr.po (+129/-131)
po/mk.po (+124/-126)
po/ml.po (+126/-128)
po/mn.po (+126/-128)
po/mr.po (+126/-128)
po/ms.po (+122/-124)
po/mus.po (+129/-131)
po/my.po (+126/-128)
po/nb.po (+119/-121)
po/nds.po (+126/-128)
po/ne.po (+126/-128)
po/nl.po (+119/-121)
po/nn.po (+122/-124)
po/oc.po (+122/-124)
po/pa.po (+124/-126)
po/pl.po (+119/-121)
po/ps.po (+129/-131)
po/pt.po (+126/-128)
po/pt_BR.po (+119/-121)
po/qu.po (+129/-131)
po/ro.po (+124/-126)
po/ru.po (+122/-124)
po/rw.po (+129/-131)
po/sc.po (+129/-131)
po/sco.po (+127/-129)
po/sd.po (+126/-128)
po/se.po (+129/-131)
po/shn.po (+129/-131)
po/si.po (+127/-129)
po/sk.po (+119/-121)
po/sl.po (+119/-121)
po/sq.po (+119/-121)
po/sr.po (+125/-127)
po/sv.po (+177/-179)
po/ta.po (+126/-128)
po/ta_LK.po (+126/-128)
po/te.po (+122/-124)
po/tg.po (+129/-131)
po/th.po (+122/-124)
po/tl.po (+124/-126)
po/tr.po (+119/-121)
po/ug.po (+120/-122)
po/uk.po (+119/-121)
po/ur.po (+129/-131)
po/uz.po (+126/-128)
po/vi.po (+122/-124)
po/xh.po (+129/-131)
po/zh_CN.po (+119/-121)
po/zh_HK.po (+119/-121)
po/zh_TW.po (+119/-121)
po/zu.po (+129/-131)
utils/demoted.cfg (+9/-2)
utils/demoted.cfg.precise (+5/-18)
To merge this branch: bzr merge lp:ubuntu/trusty-proposed/ubuntu-release-upgrader
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+402552@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

62. By Brian Murray

update mirrors and version

61. By Brian Murray

No change rebuild so the dist-upgrader tarball will be signed with the new
method. (LP: #1645906)

60. By Brian Murray

DistUpgrade/build-tarball.sh: Copy the contents of demoted.cfg so it is
not a broken symlink. (LP: #1498193)

59. By Marius Gedminas

* DistUpgrade/DistUpgradeViewText.py:
  - flush stdout before reading user input. (LP: #1417880)

58. By Brian Murray

data/removal_blacklist.cfg: make update-manager blacklist entry more
specific so it does not match update-manager-kde. (LP: #1313165)

57. By Brian Murray

* DistUpgrade/DistUpgradeApport.py:
  - modify Popen call to set universal_newlines=True (LP: #1357034)
  - log that dependency problems are not reported.
  - all apport versions support --tags now so just add dist-upgrade tag
  - remove redundant ErrorMessage string

56. By Michael Vogt

* DistUpgrade/DistUpgradeCache.py:
  - fix crash in free space check for certain locales (LP: #1172740)
  - removal of essential packages that are not in the main arch
    is ok (LP: #1307904)
  - fix str/unicode crash in certain locales when a package is
    found in the removal blacklist (LP: #1310053)
* DistUpgrade/DistUpgradeViewGtk3.py:
 - make details dialog resize when details are expanded/collapsed
   (LP: #1072460)
  - load webkit only when needed
* DistUpgrade/DistUpgradeViewText.py:
  - fix py3 crash in text mode
* DistUpgrade/DistUpgradeMain.py:
  - log python version
* po/{eo,id,ug}.po:
  - fix translations of check-new-release-gtk which cause a crash
    (LP: #1311396)
* data/demoted.cfg:
  - autmatic refresh of the demoted packages
* po/*.po:
  - automatic refresh from launchpad

55. By Michael Vogt

* DistUpgrade/DistUpgradeCache.py:
  - fix crash in free space check for certain locales (LP: #1172740)
  - removal of essential packages that are not in the main arch
    is ok (LP: #1307904)
  - fix str/unicode crash in certain locales when a package is
    found in the removal blacklist (LP: #1310053)
* DistUpgrade/DistUpgradeViewGtk3.py:
 - make details dialog resize when details are expanded/collapsed
   (LP: #1072460)
  - load webkit only when needed
* DistUpgrade/DistUpgradeView.py:
  - if no encoding is found, use C.UTF-8 to ensure that e.g. python-apt
    can read sources.list (LP: #1309447)
* DistUpgrade/DistUpgradeViewText.py:
  - fix py3 crash in text mode
* DistUpgrade/DistUpgradeMain.py:
  - log python version
* po/{eo,id,ug}.po:
  - fix translations of check-new-release-gtk which cause a crash
    (LP: #1311396)
* data/demoted.cfg:
  - autmatic refresh of the demoted packages
* po/*.po:
  - automatic refresh from launchpad

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'DistUpgrade/DistUpgradeApport.py'
2--- DistUpgrade/DistUpgradeApport.py 2014-03-28 07:43:25 +0000
3+++ DistUpgrade/DistUpgradeApport.py 2021-05-11 08:09:06 +0000
4@@ -1,6 +1,5 @@
5
6 import os
7-import os.path
8 import logging
9 import subprocess
10 import sys
11@@ -74,8 +73,12 @@
12 # dpkg messages will not be translated if DPKG_UNTRANSLATED_MESSAGES is
13 # set which it is by default so check for the English message first
14 if "dependency problems - leaving unconfigured" in errormsg:
15+ logging.debug("dpkg error because of dependency problems, not "
16+ "reporting against %s " % pkg)
17 return False
18 if gettext.dgettext('dpkg', "dependency problems - leaving unconfigured") in errormsg:
19+ logging.debug("dpkg error because of dependency problems, not "
20+ "reporting against %s " % pkg)
21 return False
22 # we do not run apport_pkgfailure for full disk errors
23 if os.strerror(errno.ENOSPC) in errormsg:
24@@ -84,18 +87,13 @@
25
26 if os.path.exists(s):
27 args = [s, "-p", pkg]
28- try:
29- import apport.ui
30- major = apport.ui.__version__.split('.')[:2]
31- if '.'.join(major) == '2.6':
32- args.extend(["--tags", "dist-upgrade"])
33- except Exception as e:
34- logging.warning("Failed to determine apport version (%s)" % e)
35+ args.extend(["--tags", "dist-upgrade"])
36 for fname in APPORT_WHITELIST:
37 args.extend(["-l", os.path.join(LOGDIR, fname)])
38 try:
39- p = subprocess.Popen(args, stdin=subprocess.PIPE)
40- p.stdin.write("ErrorMessage: %s\n" % errormsg)
41+ p = subprocess.Popen(args, stdin=subprocess.PIPE,
42+ universal_newlines=True)
43+ p.stdin.write(errormsg)
44 p.stdin.close()
45 #p.wait()
46 except Exception as e:
47
48=== modified file 'DistUpgrade/DistUpgradeCache.py'
49--- DistUpgrade/DistUpgradeCache.py 2014-04-08 17:39:37 +0000
50+++ DistUpgrade/DistUpgradeCache.py 2021-05-11 08:09:06 +0000
51@@ -25,6 +25,7 @@
52 warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning)
53 import apt
54 import apt_pkg
55+import locale
56 import os
57 import re
58 import logging
59@@ -655,10 +656,12 @@
60 # text frontend
61 self._stopAptResolverLog()
62 view.error(_("Could not calculate the upgrade"), details)
63+ # may contain utf-8 (LP: #1310053)
64+ error_msg = unicode(e)
65+ logging.error("Dist-upgrade failed: '%s'", error_msg)
66 # start the resolver log again because this is run with
67 # the withResolverLog decorator
68 self._startAptResolverLog()
69- logging.error("Dist-upgrade failed: '%s'", e)
70 return False
71 # would be nice to be able to use finally: here, but we need
72 # to run on python2.4 too
73@@ -721,14 +724,17 @@
74 """ this function tests if the current changes don't violate
75 our constrains (blacklisted removals etc)
76 """
77+ main_arch = apt_pkg.config.find("APT::Architecture")
78 removeEssentialOk = self.config.getlist("Distro", "RemoveEssentialOk")
79 # check changes
80 for pkg in self.get_changes():
81 if pkg.marked_delete and self._inRemovalBlacklist(pkg.name):
82 logging.debug("The package '%s' is marked for removal but it's in the removal blacklist", pkg.name)
83 raise SystemError(_("The package '%s' is marked for removal but it is in the removal blacklist.") % pkg.name)
84- if pkg.marked_delete and (pkg._pkg.essential == True and
85- not pkg.name in removeEssentialOk):
86+ if pkg.marked_delete and (
87+ pkg._pkg.essential == True and
88+ pkg.installed.architecture in (main_arch, "all") and
89+ not pkg.name in removeEssentialOk):
90 logging.debug("The package '%s' is marked for removal but it's an ESSENTIAL package", pkg.name)
91 raise SystemError(_("The essential package '%s' is marked for removal.") % pkg.name)
92 # check bad-versions blacklist
93@@ -1153,11 +1159,19 @@
94 required_list = {}
95 for dir in fs_free:
96 if fs_free[dir].free < 0:
97+ # ensure unicode here (LP: #1172740)
98 free_at_least = apt_pkg.size_to_str(float(abs(fs_free[dir].free)+1))
99+ if isinstance(free_at_least, bytes):
100+ free_at_least = free_at_least.decode(
101+ locale.getpreferredencoding())
102+ free_needed = apt_pkg.size_to_str(fs_free[dir].need)
103+ if isinstance(free_needed, bytes):
104+ free_needed = free_needed.decode(
105+ locale.getpreferredencoding())
106 # make_fs_id ensures we only get stuff on the same
107 # mountpoint, so we report the requirements only once
108 # per mountpoint
109- required_list[make_fs_id(dir)] = FreeSpaceRequired(apt_pkg.size_to_str(fs_free[dir].need), make_fs_id(dir), free_at_least)
110+ required_list[make_fs_id(dir)] = FreeSpaceRequired(free_needed, make_fs_id(dir), free_at_least)
111 # raise exception if free space check fails
112 if len(required_list) > 0:
113 logging.error("Not enough free space: %s" % [str(i) for i in required_list])
114
115=== modified file 'DistUpgrade/DistUpgradeMain.py'
116--- DistUpgrade/DistUpgradeMain.py 2013-07-11 11:09:44 +0000
117+++ DistUpgrade/DistUpgradeMain.py 2021-05-11 08:09:06 +0000
118@@ -114,6 +114,7 @@
119 logging.info("Using config files '%s'" % config.config_files)
120 logging.info("uname information: '%s'" % " ".join(os.uname()))
121 logging.info("apt version: '%s'" % apt.apt_pkg.VERSION)
122+ logging.info("python version: '%s'" % sys.version)
123 return logdir
124
125 def save_system_state(logdir):
126
127=== modified file 'DistUpgrade/DistUpgradeVersion.py'
128--- DistUpgrade/DistUpgradeVersion.py 2014-04-11 15:25:07 +0000
129+++ DistUpgrade/DistUpgradeVersion.py 2021-05-11 08:09:06 +0000
130@@ -1,1 +1,1 @@
131-VERSION='0.220.2'
132+VERSION='0.220.9'
133
134=== modified file 'DistUpgrade/DistUpgradeView.py'
135--- DistUpgrade/DistUpgradeView.py 2014-04-07 14:07:10 +0000
136+++ DistUpgrade/DistUpgradeView.py 2021-05-11 08:09:06 +0000
137@@ -43,8 +43,14 @@
138 logging.exception("getting the encoding failed")
139 ENCODING = "utf-8" #pyflakes
140
141+# if there is no encoding, setup UTF-8
142 if not ENCODING:
143 ENCODING = "utf-8"
144+ os.putenv("LC_CTYPE", "C.UTF-8")
145+ locale.setlocale(locale.LC_CTYPE, "C.UTF-8")
146+
147+# log locale information
148+logging.info("locale: '%s' '%s'" % locale.getlocale())
149
150
151 def FuzzyTimeToStr(sec):
152
153=== modified file 'DistUpgrade/DistUpgradeViewGtk3.py'
154--- DistUpgrade/DistUpgradeViewGtk3.py 2014-04-07 14:07:10 +0000
155+++ DistUpgrade/DistUpgradeViewGtk3.py 2021-05-11 08:09:06 +0000
156@@ -431,15 +431,7 @@
157 # we don't use this currently
158 #self.window_main.set_keep_above(True)
159 self.icontheme = Gtk.IconTheme.get_default()
160- try:
161- from gi.repository import WebKit
162- self._webkit_view = WebKit.WebView()
163- settings = self._webkit_view.get_settings()
164- settings.set_property("enable-plugins", False)
165- self.vbox_main.pack_end(self._webkit_view, True, True, 0)
166- except:
167- logging.exception("html widget")
168- self._webkit_view = None
169+ self._webkit_view = None
170 self.window_main.realize()
171 self.window_main.get_window().set_functions(Gdk.WMFunction.MOVE)
172 self._opCacheProgress = GtkOpProgress(self.progressbar_cache)
173@@ -455,6 +447,13 @@
174 self.treeview_details.append_column(column)
175 self.details_list.set_sort_column_id(0, Gtk.SortType.ASCENDING)
176 self.treeview_details.set_model(self.details_list)
177+ # lp: #1072460
178+ self.dialog_changes.set_resizable(False)
179+ def _activated(w):
180+ # the *current* expanded state which will change after the signal
181+ expanded = self.expander_details.get_expanded()
182+ self.dialog_changes.set_resizable(not expanded)
183+ self.expander_details.connect("activate", _activated)
184 # FIXME: portme
185 # Use italic style in the status labels
186 #attrlist=Pango.AttrList()
187@@ -490,6 +489,16 @@
188 def getTerminal(self):
189 return DistUpgradeVteTerminal(self, self._term)
190 def getHtmlView(self):
191+ if self._webkit_view is None:
192+ try:
193+ from gi.repository import WebKit
194+ self._webkit_view = WebKit.WebView()
195+ settings = self._webkit_view.get_settings()
196+ settings.set_property("enable-plugins", False)
197+ self.vbox_main.pack_end(self._webkit_view, True, True, 0)
198+ except:
199+ logging.exception("html widget")
200+ return DistUpgradeView.DummyHtmlView()
201 return HtmlView(self._webkit_view)
202
203 def _key_press_handler(self, widget, keyev):
204
205=== modified file 'DistUpgrade/DistUpgradeViewText.py'
206--- DistUpgrade/DistUpgradeViewText.py 2014-04-08 17:39:37 +0000
207+++ DistUpgrade/DistUpgradeViewText.py 2021-05-11 08:09:06 +0000
208@@ -42,6 +42,15 @@
209 from .utils import twrap
210
211
212+def readline():
213+ """ py2/py3 compatible readline from stdin """
214+ sys.stdout.flush()
215+ s = sys.stdin.readline()
216+ if hasattr(s, "decode"):
217+ return s.decode(ENCODING, "backslashreplace")
218+ return s
219+
220+
221 class TextAcquireProgress(AcquireProgress, apt.progress.text.AcquireProgress):
222 def __init__(self):
223 apt.progress.text.AcquireProgress.__init__(self)
224@@ -136,7 +145,7 @@
225 if extended_msg:
226 print(twrap(extended_msg))
227 print(_("To continue please press [ENTER]"))
228- sys.stdin.readline().decode(ENCODING, "backslashreplace")
229+ readline()
230 def error(self, summary, msg, extended_msg=None):
231 print()
232 print(twrap(summary))
233@@ -175,7 +184,7 @@
234 print(" %s %s" % (_("Continue [yN] "), _("Details [d]")), end="")
235 sys.stdout.flush()
236 while True:
237- res = sys.stdin.readline().decode(ENCODING, "backslashreplace")
238+ res = readline()
239 # TRANSLATORS: the "y" is "yes"
240 if res.strip().lower().startswith(_("y")):
241 return True
242@@ -219,14 +228,14 @@
243 print(twrap(msg))
244 if default == 'No':
245 print(_("Continue [yN] "), end="")
246- res = sys.stdin.readline().decode(ENCODING, "backslashreplace")
247+ res = readline()
248 # TRANSLATORS: first letter of a positive (yes) answer
249 if res.strip().lower().startswith(_("y")):
250 return True
251 return False
252 else:
253 print(_("Continue [Yn] "), end="")
254- res = sys.stdin.readline().decode(ENCODING, "backslashreplace")
255+ res = readline()
256 # TRANSLATORS: first letter of a negative (no) answer
257 if res.strip().lower().startswith(_("n")):
258 return False
259
260=== modified file 'DistUpgrade/build-tarball.sh'
261--- DistUpgrade/build-tarball.sh 2013-10-29 10:18:07 +0000
262+++ DistUpgrade/build-tarball.sh 2021-05-11 08:09:06 +0000
263@@ -31,11 +31,11 @@
264 # copy nvidia obsoleted drivers data
265 cp /usr/share/ubuntu-drivers-common/obsolete ubuntu-drivers-obsolete.pkgs
266
267-# create the tarball, copy links in place
268+# create the tarball, copy links in place
269 tar -c -h -v --exclude DistUpgrade --exclude=$DIST.tar --exclude=$0 -X build-exclude.txt -f $DIST.tar ./*
270
271-# add *.cfg and *.ui to the tarball
272-tar --append -v -f $DIST.tar --transform 's|.*/|./|' ../data/*.cfg* ../data/gtkbuilder/*.ui
273+# add *.cfg and *.ui to the tarball, copy links (demotions) in place
274+tar --append -h -v -f $DIST.tar --transform 's|.*/|./|' ../data/*.cfg* ../data/gtkbuilder/*.ui
275
276 # add "DistUpgrade" symlink as symlink
277 tar --append -v -f $DIST.tar ./DistUpgrade
278
279=== modified file 'data/mirrors.cfg'
280--- data/mirrors.cfg 2014-04-07 14:07:10 +0000
281+++ data/mirrors.cfg 2021-05-11 08:09:06 +0000
282@@ -901,3 +901,155 @@
283 http://ubuntu.mirror.ac.ke/ubuntu/
284 http://ubuntu.ucr.ac.cr/ubuntu/
285 http://jaran.undip.ac.id/ubuntu/
286+http://mirror.vnet.sk/ubuntu/
287+http://mirror.vutbr.cz/ubuntu/archive/
288+http://ubuntu.mirror.lrz.de/ubuntu/
289+http://es-mirrors.evowise.com/ubuntu/
290+http://archive.mirror.blix.com/ubuntu/
291+http://ftp.uni-stuttgart.de/ubuntu/
292+http://it-mirrors.evowise.com/ubuntu/
293+http://la-mirrors.evowise.com/ubuntu/
294+http://mirror.0x.sg/ubuntu/
295+http://mirror.1000mbps.com/ubuntu/
296+http://mirror.as43289.net/ubuntu/
297+http://mirror.earthlink.iq/ubuntu/
298+http://mirror.math.princeton.edu/pub/ubuntu/
299+http://mirror.nforce.com/pub/linux/ubuntu/
300+http://mirror.one.com/ubuntu/
301+http://mirror.onet.pl/pub/mirrors/ubuntu/
302+http://mirror.ufscar.br/ubuntu/
303+http://mirror.vorboss.net/ubuntu-archive/
304+http://mirrors.up.pt/ubuntu/
305+http://muug.ca/mirror/ubuntu/
306+http://ny-mirrors.evowise.com/ubuntu/
307+http://repos.forethought.net/ubuntu/
308+http://ro-mirrors.evowise.com/ubuntu/
309+http://ubuntu.ethz.ch/ubuntu/
310+http://ubuntu.localmsp.org/ubuntu/
311+http://ubuntu.mirror.garr.it/ubuntu/
312+http://ubuntu.uberglobalmirror.com/archive/
313+http://ubuntu.volia.net/ubuntu-archive/
314+http://uk-mirrors.evowise.com/ubuntu/
315+http://mirrors.wikimedia.org/ubuntu/
316+http://ftp.ubuntu-tw.net/ubuntu/
317+http://ftp.fau.de/ubuntu/
318+http://mirror.23media.de/ubuntu/
319+http://mirror.dataone.nl/ubuntu-archive/
320+http://mirror.transip.net/ubuntu/ubuntu/
321+http://ftp.energotel.sk/pub/linux/ubuntu/archive/
322+http://linux.yz.yamagata-u.ac.jp/pub/linux/ubuntu-archive/
323+http://mirror.amsiohosting.net/archive.ubuntu.com/
324+http://mirror.atlantic.net/ubuntu/
325+http://mirror.dkm.cz/ubuntu/
326+http://mirror.plusserver.com/ubuntu/ubuntu/
327+http://mirror.rasanegar.com/ubuntu/archive/
328+http://mirror.uchile.cl/ubuntu/
329+http://mirrors.aliyun.com/ubuntu/
330+http://mirrors.neterra.net/ubuntu/
331+http://ubuntu.mirrors.omnilance.com/ubuntu/
332+http://ubuntu.mirrors.ovh.net/ftp.ubuntu.com/ubuntu/
333+http://archive.ubuntu.mirror.rafal.ca/ubuntu/
334+http://archive.ubuntu.mirrors.opensource.ynu.edu.cn/
335+http://ftp.agh.edu.pl/ubuntu/
336+http://ftp.aso.ee/ubuntu/
337+http://ftp.cs.pu.edu.tw/Linux/Ubuntu/Archive/
338+http://ftp.ntua.gr/ubuntu/
339+http://ftp.rezopole.net/ubuntu/
340+http://ftp.sh.cvut.cz/ubuntu/
341+http://ftp.yzu.edu.tw/ubuntu/
342+http://kebo.pens.ac.id/ubuntu/
343+http://mirror.adminbannok.com/ubuntu/
344+http://mirror.aminidc.com/ubuntu/
345+http://mirror.as24220.net/pub/ubuntu/
346+http://mirror.atomki.mta.hu/ubuntu/
347+http://mirror.stw-aachen.de/ubuntu/
348+http://mirror.cc.vt.edu/pub2/ubuntu/
349+http://mirror.cs.pitt.edu/ubuntu/archive/
350+http://mirror.daniel-jost.net/ubuntu/
351+http://mirror.datacenter.az/ubuntu/
352+http://mirror.dhakacom.com/ubuntu-archive/
353+http://mirror.fairway.ne.jp/ubuntu/
354+http://mirror.faraso.org/ubuntu/
355+http://mirror.freethought-internet.co.uk/ubuntu/
356+http://mirror.htnshost.com/ubuntu/
357+http://mirror.idealhosting.net.tr/ubuntu/
358+http://mirror.intergrid.com.au/ubuntu/
359+http://mirror.it.ubc.ca/ubuntu/
360+http://ubuntu.lagoon.nc/ubuntu/
361+http://mirror.mythic-beasts.com/ubuntu/
362+http://mirror.network32.net/ubuntu/
363+http://mirror.os6.org/ubuntu/
364+http://mirror.sax.uk.as61049.net/ubuntu/
365+http://mirror.sjc02.svwh.net/ubuntu/
366+http://mirror.t-home.mk/ubuntu/
367+http://mirror.tcc.wa.edu.au/ubuntu/
368+http://mirror.wiru.co.za/ubuntu/
369+http://mirror.zetup.net/ubuntu/
370+http://mirror.zol.co.zw/ubuntu/
371+http://mirror1.totbb.net/ubuntu/
372+http://mirrordenver.fdcservers.net/ubuntu/
373+http://mirrors.asnet.am/ubuntu/
374+http://mirrors.cn99.com/ubuntu/
375+http://mirrors.eastera.tj/ubuntu/
376+http://mirrors.maine.edu/ubuntu/
377+http://mirrors.namecheap.com/ubuntu/
378+http://mirrors.noction.com/ubuntu/archive/
379+http://mirrors.ocf.berkeley.edu/ubuntu/
380+http://mirrors.pidginhost.com/ubuntu/
381+http://mirrors.psu.ac.th/ubuntu/
382+http://mirrors.sonic.net/ubuntu/
383+http://mirrors.tripadvisor.com/ubuntu/
384+http://mirrors.usinternet.com/ubuntu/archive/
385+http://mirror.ni.net.tr/ubuntu/
386+http://pkg.adfinis-sygroup.ch/ubuntu/
387+http://pubmirrors.dal.corespace.com/ubuntu/
388+http://repo.bigstepcloud.com/ubuntu/
389+http://ftp.ntou.edu.tw/ubuntu/
390+http://mirrors.skyshe.cn/ubuntu/
391+http://ubuntu-mirror.neocom.org.ua/ubuntu/
392+http://ubuntu-mirror.parsdev.net/ubuntu-archive/
393+http://ubuntu.hysing.is/ubuntu/
394+http://ubuntu.man.lodz.pl/ubuntu/
395+http://ubuntu.mirror.digitalpacific.com.au/archive/
396+http://ubuntu.mirror.lhisp.com/ubuntu/
397+http://ubuntu.mirror.serversaustralia.com.au/ubuntu/
398+http://ubuntu.mirror.tn/ubuntu/
399+http://ubuntu.mirror.true.nl/ubuntu/
400+http://ubuntu.mirrors.linux.ro/archive/
401+http://ubuntu.parspack.com/ubuntu/
402+http://ubuntu.saglayici.com/ubuntu/
403+http://ubuntu.skybroadband.com.ph/ubuntu/
404+http://mirror.stjschools.org/public/ubuntu-archive/
405+http://ubuntu.uni-sofia.bg/ubuntu/
406+http://ubuntuarchive.mirror.nac.net/
407+http://dist1.800hosting.com/ubuntu/
408+http://fastmirror.ir/ubuntu/
409+ftp://ftp.csuc.cat/ubuntu/archieve/
410+http://mirror.aptus.co.tz/pub/ubuntuarchive/
411+http://mirror.cedia.org.ec/ubuntu/
412+http://mirror.cedille.club/ubuntu/
413+http://mirror.digistar.vn/ubuntu/
414+http://mirror.espol.edu.ec/ubuntu/
415+http://mirror.iranserver.com/ubuntu/
416+http://mirror.rise.ph/ubuntu/
417+http://mirror01.idc.hinet.net/ubuntu/
418+http://mirrors.cqu.edu.cn/ubuntu/
419+http://mirrors.cug.edu.cn/ubuntu/
420+http://mirrors.nayatel.com/ubuntu/
421+http://mirrors.nhanhoa.com/ubuntu/
422+http://mirrors.psychz.net/Ubuntu/
423+http://mirrors.xjtu.edu.cn/ubuntu/
424+http://ubnt-archive.xfree.com.ar/ubuntu/
425+http://ubuntu.dts.mg/ubuntu/
426+http://ubuntu.ipserverone.com/ubuntu/
427+http://ubuntu.mirror.ftn.uns.ac.rs/archive/
428+http://ubuntu.mirrors.wvstateu.edu/
429+http://ubuntu.uniminuto.edu/ubuntu/
430+http://deb-mirror.habari.co.tz/ubuntu/
431+http://opensource.xtdv.net/ubuntu/
432+http://reflector.westga.edu/repos/Ubuntu/archive/
433+http://repo.cure.edu.uy/ubuntu/archivos/
434+http://repo.unpatti.ac.id/ubuntu/
435+http://ftp.gts.lug.ro/ubuntu/
436+http://mirror.poliwangi.ac.id/ubuntu/
437+http://repo.gust.edu.kw/ubuntu/
438
439=== modified file 'data/removal_blacklist.cfg'
440--- data/removal_blacklist.cfg 2014-04-08 17:39:37 +0000
441+++ data/removal_blacklist.cfg 2021-05-11 08:09:06 +0000
442@@ -8,7 +8,7 @@
443 mythbuntu-desktop
444 ubuntustudio-desktop
445 # ubuntu-release-upgrader should not remove itself or update-manager
446-update-manager
447+update-manager$
448 update-manager-core
449 ubuntu-release-upgrader
450 # posgresql (LP: #871893)
451
452=== modified file 'debian/changelog'
453--- debian/changelog 2014-04-11 15:25:07 +0000
454+++ debian/changelog 2021-05-11 08:09:06 +0000
455@@ -1,3 +1,67 @@
456+ubuntu-release-upgrader (1:0.220.9) trusty-proposed; urgency=medium
457+
458+ * No change rebuild so the dist-upgrader tarball will be signed with the new
459+ method. (LP: #1645906)
460+
461+ -- Brian Murray <brian@ubuntu.com> Wed, 30 Nov 2016 09:53:35 -0800
462+
463+ubuntu-release-upgrader (1:0.220.8) trusty-proposed; urgency=medium
464+
465+ * DistUpgrade/build-tarball.sh: Copy the contents of demoted.cfg so it is
466+ not a broken symlink. (LP: #1498193)
467+
468+ -- Brian Murray <brian@ubuntu.com> Tue, 29 Sep 2015 12:56:26 -0700
469+
470+ubuntu-release-upgrader (1:0.220.7) trusty; urgency=medium
471+
472+ * DistUpgrade/DistUpgradeViewText.py:
473+ - flush stdout before reading user input. (LP: #1417880)
474+
475+ -- Marius Gedminas <marius@gedmin.as> Wed, 04 Feb 2015 10:49:34 -0500
476+
477+ubuntu-release-upgrader (1:0.220.6) trusty-proposed; urgency=medium
478+
479+ * data/removal_blacklist.cfg: make update-manager blacklist entry more
480+ specific so it does not match update-manager-kde. (LP: #1313165)
481+
482+ -- Brian Murray <brian@ubuntu.com> Thu, 13 Nov 2014 14:10:13 -0800
483+
484+ubuntu-release-upgrader (1:0.220.5) trusty-proposed; urgency=medium
485+
486+ * DistUpgrade/DistUpgradeApport.py:
487+ - modify Popen call to set universal_newlines=True (LP: #1357034)
488+ - log that dependency problems are not reported.
489+ - all apport versions support --tags now so just add dist-upgrade tag
490+ - remove redundant ErrorMessage string
491+
492+ -- Brian Murray <brian@ubuntu.com> Fri, 29 Aug 2014 13:09:31 -0700
493+
494+ubuntu-release-upgrader (1:0.220.4) trusty-proposed; urgency=low
495+
496+ * DistUpgrade/DistUpgradeCache.py:
497+ - fix crash in free space check for certain locales (LP: #1172740)
498+ - removal of essential packages that are not in the main arch
499+ is ok (LP: #1307904)
500+ - fix str/unicode crash in certain locales when a package is
501+ found in the removal blacklist (LP: #1310053)
502+ * DistUpgrade/DistUpgradeViewGtk3.py:
503+ - make details dialog resize when details are expanded/collapsed
504+ (LP: #1072460)
505+ - load webkit only when needed
506+ * DistUpgrade/DistUpgradeViewText.py:
507+ - fix py3 crash in text mode
508+ * DistUpgrade/DistUpgradeMain.py:
509+ - log python version
510+ * po/{eo,id,ug}.po:
511+ - fix translations of check-new-release-gtk which cause a crash
512+ (LP: #1311396)
513+ * data/demoted.cfg:
514+ - autmatic refresh of the demoted packages
515+ * po/*.po:
516+ - automatic refresh from launchpad
517+
518+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 24 Apr 2014 14:57:39 +0200
519+
520 ubuntu-release-upgrader (1:0.220.2) trusty; urgency=medium
521
522 * DistUpgrade/DistUpgradeController.py:
523
524=== modified file 'po/af.po'
525--- po/af.po 2014-04-07 14:07:10 +0000
526+++ po/af.po 2021-05-11 08:09:06 +0000
527@@ -15,12 +15,12 @@
528 "Content-Type: text/plain; charset=UTF-8\n"
529 "Content-Transfer-Encoding: 8bit\n"
530 "Plural-Forms: nplurals=2; plural=n != 1;\n"
531-"X-Launchpad-Export-Date: 2014-04-05 06:07+0000\n"
532-"X-Generator: Launchpad (build 16976)\n"
533+"X-Launchpad-Export-Date: 2014-04-23 06:50+0000\n"
534+"X-Generator: Launchpad (build 16985)\n"
535 "Language: af\n"
536
537 #. TRANSLATORS: %s is a country
538-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
539+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:441
540 #, python-format
541 msgid "Server for %s"
542 msgstr "Bediener vir %s"
543@@ -183,18 +183,19 @@
544 msgid "Trying to install blacklisted version '%s'"
545 msgstr "Probeer tans om die swartlys weergawe '%s' te installeer."
546
547-#: ../DistUpgrade/DistUpgradeCache.py:860
548+#: ../DistUpgrade/DistUpgradeCache.py:859
549 #, python-format
550 msgid "Can't install '%s'"
551 msgstr "Kan nie '%s' installeer nie."
552
553-#: ../DistUpgrade/DistUpgradeCache.py:861
554+#: ../DistUpgrade/DistUpgradeCache.py:860
555 msgid ""
556 "It was impossible to install a required package. Please report this as a bug "
557 "using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
558 msgstr ""
559
560-#: ../DistUpgrade/DistUpgradeCache.py:872
561+#. FIXME: provide a list
562+#: ../DistUpgrade/DistUpgradeCache.py:871
563 msgid "Can't guess meta-package"
564 msgstr "Kan nie 'n meta-paket raai nie"
565
566@@ -417,22 +418,21 @@
567 "will cancel."
568 msgstr ""
569
570-#: ../DistUpgrade/DistUpgradeController.py:820
571-#: ../DistUpgrade/DistUpgradeController.py:826
572+#: ../DistUpgrade/DistUpgradeController.py:819
573 msgid "Repository information invalid"
574 msgstr "Stoorplek inligting ongeldig"
575
576-#: ../DistUpgrade/DistUpgradeController.py:821
577+#: ../DistUpgrade/DistUpgradeController.py:820
578 msgid ""
579 "Upgrading the repository information resulted in a invalid file so a bug "
580 "reporting process is being started."
581 msgstr ""
582
583-#: ../DistUpgrade/DistUpgradeController.py:836
584+#: ../DistUpgrade/DistUpgradeController.py:827
585 msgid "Third party sources disabled"
586 msgstr "Derde-party bronne versper"
587
588-#: ../DistUpgrade/DistUpgradeController.py:837
589+#: ../DistUpgrade/DistUpgradeController.py:828
590 msgid ""
591 "Some third party entries in your sources.list were disabled. You can re-"
592 "enable them after the upgrade with the 'software-properties' tool or your "
593@@ -442,13 +442,13 @@
594 "die opgradering herstel deur gebruik te maak van die 'software-properties' "
595 "nutsprogram of u pakket bestuurder."
596
597-#: ../DistUpgrade/DistUpgradeController.py:879
598+#: ../DistUpgrade/DistUpgradeController.py:870
599 msgid "Package in inconsistent state"
600 msgid_plural "Packages in inconsistent state"
601 msgstr[0] "Pakket in inkonsekwente toestand"
602 msgstr[1] "Pakkette in inkonsekwente toestand"
603
604-#: ../DistUpgrade/DistUpgradeController.py:882
605+#: ../DistUpgrade/DistUpgradeController.py:873
606 #, python-format
607 msgid ""
608 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
609@@ -461,11 +461,11 @@
610 msgstr[0] ""
611 msgstr[1] ""
612
613-#: ../DistUpgrade/DistUpgradeController.py:930
614+#: ../DistUpgrade/DistUpgradeController.py:921
615 msgid "Error during update"
616 msgstr "Fout gedurende opdatering"
617
618-#: ../DistUpgrade/DistUpgradeController.py:931
619+#: ../DistUpgrade/DistUpgradeController.py:922
620 msgid ""
621 "A problem occurred during the update. This is usually some sort of network "
622 "problem, please check your network connection and retry."
623@@ -474,11 +474,11 @@
624 "van 'n probleem met die netwerkverbing. Kontrolleer asseblief u "
625 "netwerkverbinding en probeer weer."
626
627-#: ../DistUpgrade/DistUpgradeController.py:940
628+#: ../DistUpgrade/DistUpgradeController.py:931
629 msgid "Not enough free disk space"
630 msgstr "Onvoldoende skyfspasie beskikaar"
631
632-#: ../DistUpgrade/DistUpgradeController.py:941
633+#: ../DistUpgrade/DistUpgradeController.py:932
634 #, python-format
635 msgid ""
636 "The upgrade has aborted. The upgrade needs a total of %s free space on disk "
637@@ -489,32 +489,32 @@
638
639 #. calc the dist-upgrade and see if the removals are ok/expected
640 #. do the dist-upgrade
641-#: ../DistUpgrade/DistUpgradeController.py:970
642-#: ../DistUpgrade/DistUpgradeController.py:1778
643+#: ../DistUpgrade/DistUpgradeController.py:961
644+#: ../DistUpgrade/DistUpgradeController.py:1743
645 msgid "Calculating the changes"
646 msgstr "Bereken die veranderinge"
647
648 #. ask the user
649-#: ../DistUpgrade/DistUpgradeController.py:1002
650+#: ../DistUpgrade/DistUpgradeController.py:993
651 msgid "Do you want to start the upgrade?"
652 msgstr "Begin met opgradering?"
653
654-#: ../DistUpgrade/DistUpgradeController.py:1075
655+#: ../DistUpgrade/DistUpgradeController.py:1066
656 msgid "Upgrade canceled"
657 msgstr "Opgradering gekanselleer"
658
659-#: ../DistUpgrade/DistUpgradeController.py:1076
660+#: ../DistUpgrade/DistUpgradeController.py:1067
661 msgid ""
662 "The upgrade will cancel now and the original system state will be restored. "
663 "You can resume the upgrade at a later time."
664 msgstr ""
665
666-#: ../DistUpgrade/DistUpgradeController.py:1082
667-#: ../DistUpgrade/DistUpgradeController.py:1206
668+#: ../DistUpgrade/DistUpgradeController.py:1073
669+#: ../DistUpgrade/DistUpgradeController.py:1197
670 msgid "Could not download the upgrades"
671 msgstr "Kon nie die opgraderings aflaai nie"
672
673-#: ../DistUpgrade/DistUpgradeController.py:1083
674+#: ../DistUpgrade/DistUpgradeController.py:1074
675 msgid ""
676 "The upgrade has aborted. Please check your Internet connection or "
677 "installation media and try again. All files downloaded so far have been kept."
678@@ -522,33 +522,33 @@
679
680 #. FIXME: strings are not good, but we are in string freeze
681 #. currently
682-#: ../DistUpgrade/DistUpgradeController.py:1157
683-#: ../DistUpgrade/DistUpgradeController.py:1194
684-#: ../DistUpgrade/DistUpgradeController.py:1299
685+#: ../DistUpgrade/DistUpgradeController.py:1148
686+#: ../DistUpgrade/DistUpgradeController.py:1185
687+#: ../DistUpgrade/DistUpgradeController.py:1290
688 msgid "Error during commit"
689 msgstr ""
690
691 #. generate a new cache
692-#: ../DistUpgrade/DistUpgradeController.py:1159
693-#: ../DistUpgrade/DistUpgradeController.py:1196
694-#: ../DistUpgrade/DistUpgradeController.py:1338
695+#: ../DistUpgrade/DistUpgradeController.py:1150
696+#: ../DistUpgrade/DistUpgradeController.py:1187
697+#: ../DistUpgrade/DistUpgradeController.py:1329
698 msgid "Restoring original system state"
699 msgstr "Oorspronklike stelseltoestand word herstel"
700
701-#: ../DistUpgrade/DistUpgradeController.py:1160
702-#: ../DistUpgrade/DistUpgradeController.py:1175
703-#: ../DistUpgrade/DistUpgradeController.py:1197
704+#: ../DistUpgrade/DistUpgradeController.py:1151
705+#: ../DistUpgrade/DistUpgradeController.py:1166
706+#: ../DistUpgrade/DistUpgradeController.py:1188
707 msgid "Could not install the upgrades"
708 msgstr "Kon nie die opgraderings installeer nie"
709
710 #. invoke the frontend now and show a error message
711-#: ../DistUpgrade/DistUpgradeController.py:1165
712+#: ../DistUpgrade/DistUpgradeController.py:1156
713 msgid ""
714 "The upgrade has aborted. Your system could be in an unusable state. A "
715 "recovery will run now (dpkg --configure -a)."
716 msgstr ""
717
718-#: ../DistUpgrade/DistUpgradeController.py:1170
719+#: ../DistUpgrade/DistUpgradeController.py:1161
720 #, python-format
721 msgid ""
722 "\n"
723@@ -559,26 +559,26 @@
724 "%s"
725 msgstr ""
726
727-#: ../DistUpgrade/DistUpgradeController.py:1207
728+#: ../DistUpgrade/DistUpgradeController.py:1198
729 msgid ""
730 "The upgrade has aborted. Please check your Internet connection or "
731 "installation media and try again. "
732 msgstr ""
733
734-#: ../DistUpgrade/DistUpgradeController.py:1287
735+#: ../DistUpgrade/DistUpgradeController.py:1278
736 msgid "Remove obsolete packages?"
737 msgstr "Verouderde pakkette verwyder?"
738
739-#: ../DistUpgrade/DistUpgradeController.py:1288
740+#: ../DistUpgrade/DistUpgradeController.py:1279
741 #: ../data/gtkbuilder/DistUpgrade.ui.h:8
742 msgid "_Keep"
743 msgstr "_Behou"
744
745-#: ../DistUpgrade/DistUpgradeController.py:1288
746+#: ../DistUpgrade/DistUpgradeController.py:1279
747 msgid "_Remove"
748 msgstr "Sk_rap"
749
750-#: ../DistUpgrade/DistUpgradeController.py:1300
751+#: ../DistUpgrade/DistUpgradeController.py:1291
752 msgid ""
753 "A problem occurred during the clean-up. Please see the below message for "
754 "more information. "
755@@ -588,39 +588,37 @@
756
757 #. FIXME: instead of error out, fetch and install it
758 #. here
759-#: ../DistUpgrade/DistUpgradeController.py:1376
760+#: ../DistUpgrade/DistUpgradeController.py:1367
761 msgid "Required depends is not installed"
762 msgstr ""
763
764-#: ../DistUpgrade/DistUpgradeController.py:1377
765+#: ../DistUpgrade/DistUpgradeController.py:1368
766 #, python-format
767 msgid "The required dependency '%s' is not installed. "
768 msgstr ""
769
770 #. sanity check (check for ubuntu-desktop, brokenCache etc)
771 #. then open the cache (again)
772-#: ../DistUpgrade/DistUpgradeController.py:1645
773-#: ../DistUpgrade/DistUpgradeController.py:1732
774+#: ../DistUpgrade/DistUpgradeController.py:1636
775+#: ../DistUpgrade/DistUpgradeController.py:1701
776 msgid "Checking package manager"
777 msgstr "Kontrolleer pakketbestuurder"
778
779-#: ../DistUpgrade/DistUpgradeController.py:1651
780-#: ../DistUpgrade/DistUpgradeController.py:1657
781+#: ../DistUpgrade/DistUpgradeController.py:1641
782 msgid "Preparing the upgrade failed"
783 msgstr "Misluk om die opgradering voor te berei"
784
785-#: ../DistUpgrade/DistUpgradeController.py:1652
786+#: ../DistUpgrade/DistUpgradeController.py:1642
787 msgid ""
788 "Preparing the system for the upgrade failed so a bug reporting process is "
789 "being started."
790 msgstr ""
791
792-#: ../DistUpgrade/DistUpgradeController.py:1675
793-#: ../DistUpgrade/DistUpgradeController.py:1685
794+#: ../DistUpgrade/DistUpgradeController.py:1656
795 msgid "Getting upgrade prerequisites failed"
796 msgstr ""
797
798-#: ../DistUpgrade/DistUpgradeController.py:1676
799+#: ../DistUpgrade/DistUpgradeController.py:1657
800 msgid ""
801 "The system was unable to get the prerequisites for the upgrade. The upgrade "
802 "will abort now and restore the original system state.\n"
803@@ -628,23 +626,23 @@
804 "Additionally, a bug reporting process is being started."
805 msgstr ""
806
807-#: ../DistUpgrade/DistUpgradeController.py:1716
808+#: ../DistUpgrade/DistUpgradeController.py:1685
809 msgid "Updating repository information"
810 msgstr "Stoorplek inligting word opgedateer"
811
812-#: ../DistUpgrade/DistUpgradeController.py:1723
813+#: ../DistUpgrade/DistUpgradeController.py:1692
814 msgid "Failed to add the cdrom"
815 msgstr ""
816
817+#: ../DistUpgrade/DistUpgradeController.py:1693
818+msgid "Sorry, adding the cdrom was not successful."
819+msgstr ""
820+
821 #: ../DistUpgrade/DistUpgradeController.py:1724
822-msgid "Sorry, adding the cdrom was not successful."
823-msgstr ""
824-
825-#: ../DistUpgrade/DistUpgradeController.py:1755
826 msgid "Invalid package information"
827 msgstr "Ongeldige pakketinligting"
828
829-#: ../DistUpgrade/DistUpgradeController.py:1756
830+#: ../DistUpgrade/DistUpgradeController.py:1725
831 #, python-format
832 msgid ""
833 "After updating your package information, the essential package '%s' could "
834@@ -656,60 +654,60 @@
835 "later."
836 msgstr ""
837
838-#: ../DistUpgrade/DistUpgradeController.py:1784
839-#: ../DistUpgrade/DistUpgradeController.py:1840
840+#: ../DistUpgrade/DistUpgradeController.py:1749
841+#: ../DistUpgrade/DistUpgradeController.py:1805
842 msgid "Fetching"
843 msgstr "Haal tans"
844
845-#: ../DistUpgrade/DistUpgradeController.py:1790
846-#: ../DistUpgrade/DistUpgradeController.py:1844
847+#: ../DistUpgrade/DistUpgradeController.py:1755
848+#: ../DistUpgrade/DistUpgradeController.py:1809
849 msgid "Upgrading"
850 msgstr "Besig om op te gradeer"
851
852 #. don't abort here, because it would restore the sources.list
853-#: ../DistUpgrade/DistUpgradeController.py:1795
854-#: ../DistUpgrade/DistUpgradeController.py:1846
855-#: ../DistUpgrade/DistUpgradeController.py:1853
856-#: ../DistUpgrade/DistUpgradeController.py:1864
857+#: ../DistUpgrade/DistUpgradeController.py:1760
858+#: ../DistUpgrade/DistUpgradeController.py:1811
859+#: ../DistUpgrade/DistUpgradeController.py:1818
860+#: ../DistUpgrade/DistUpgradeController.py:1829
861 msgid "Upgrade complete"
862 msgstr "Opgradering voltooi"
863
864-#: ../DistUpgrade/DistUpgradeController.py:1796
865-#: ../DistUpgrade/DistUpgradeController.py:1847
866-#: ../DistUpgrade/DistUpgradeController.py:1854
867+#: ../DistUpgrade/DistUpgradeController.py:1761
868+#: ../DistUpgrade/DistUpgradeController.py:1812
869+#: ../DistUpgrade/DistUpgradeController.py:1819
870 msgid ""
871 "The upgrade has completed but there were errors during the upgrade process."
872 msgstr ""
873
874-#: ../DistUpgrade/DistUpgradeController.py:1803
875+#: ../DistUpgrade/DistUpgradeController.py:1768
876 msgid "Searching for obsolete software"
877 msgstr "Soek na verouderde sagteware"
878
879-#: ../DistUpgrade/DistUpgradeController.py:1816
880+#: ../DistUpgrade/DistUpgradeController.py:1781
881 msgid "System upgrade is complete."
882 msgstr "Sisteem-opgradering voltooi."
883
884-#: ../DistUpgrade/DistUpgradeController.py:1865
885+#: ../DistUpgrade/DistUpgradeController.py:1830
886 msgid "The partial upgrade was completed."
887 msgstr "Die gedeeltelike opgradering is voltooi."
888
889 #: ../DistUpgrade/DistUpgradeFetcher.py:123
890-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:117
891+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:119
892 msgid "Could not find the release notes"
893 msgstr ""
894
895 #: ../DistUpgrade/DistUpgradeFetcher.py:124
896-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:118
897+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:120
898 msgid "The server may be overloaded. "
899 msgstr "Die bediener is dalk oorlaai. "
900
901 #: ../DistUpgrade/DistUpgradeFetcher.py:136
902-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:122
903+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:124
904 msgid "Could not download the release notes"
905 msgstr ""
906
907 #: ../DistUpgrade/DistUpgradeFetcher.py:137
908-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:123
909+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:125
910 msgid "Please check your internet connection."
911 msgstr "Kontrolleer asseblief u Internet-verbinding."
912
913@@ -718,43 +716,43 @@
914 msgid "authenticate '%(file)s' against '%(signature)s' "
915 msgstr ""
916
917-#: ../DistUpgrade/DistUpgradeFetcherCore.py:139
918+#: ../DistUpgrade/DistUpgradeFetcherCore.py:136
919 #, python-format
920 msgid "extracting '%s'"
921 msgstr ""
922
923-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
924-#: ../DistUpgrade/DistUpgradeFetcherCore.py:161
925+#: ../DistUpgrade/DistUpgradeFetcherCore.py:157
926+#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
927 msgid "Could not run the upgrade tool"
928 msgstr "Kon nie die opgradering-nutsprogram loop nie."
929
930-#: ../DistUpgrade/DistUpgradeFetcherCore.py:162
931+#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
932 msgid ""
933 "This is most likely a bug in the upgrade tool. Please report it as a bug "
934 "using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
935 msgstr ""
936
937-#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
938+#: ../DistUpgrade/DistUpgradeFetcherCore.py:236
939 msgid "Upgrade tool signature"
940 msgstr ""
941
942-#: ../DistUpgrade/DistUpgradeFetcherCore.py:246
943+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
944 msgid "Upgrade tool"
945 msgstr "Opgradering-nutsprogram"
946
947-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
948+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
949 msgid "Failed to fetch"
950 msgstr ""
951
952-#: ../DistUpgrade/DistUpgradeFetcherCore.py:281
953+#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
954 msgid "Fetching the upgrade failed. There may be a network problem. "
955 msgstr ""
956
957-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
958+#: ../DistUpgrade/DistUpgradeFetcherCore.py:282
959 msgid "Authentication failed"
960 msgstr "Stawing het misluk"
961
962-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
963+#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
964 msgid ""
965 "Authenticating the upgrade failed. There may be a problem with the network "
966 "or with the server. "
967@@ -762,21 +760,21 @@
968 "Stawing van die opgradering het misluk. Daar is moontlik 'n probleem met die "
969 "netwerkverbinding of die bediener. "
970
971-#: ../DistUpgrade/DistUpgradeFetcherCore.py:291
972+#: ../DistUpgrade/DistUpgradeFetcherCore.py:288
973 msgid "Failed to extract"
974 msgstr ""
975
976-#: ../DistUpgrade/DistUpgradeFetcherCore.py:292
977+#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
978 msgid ""
979 "Extracting the upgrade failed. There may be a problem with the network or "
980 "with the server. "
981 msgstr ""
982
983-#: ../DistUpgrade/DistUpgradeFetcherCore.py:297
984+#: ../DistUpgrade/DistUpgradeFetcherCore.py:294
985 msgid "Verification failed"
986 msgstr "Verifikasie het misluk"
987
988-#: ../DistUpgrade/DistUpgradeFetcherCore.py:298
989+#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
990 msgid ""
991 "Verifying the upgrade failed. There may be a problem with the network or "
992 "with the server. "
993@@ -784,49 +782,49 @@
994 "Verifikasie van die opgradering het misluk. Daar is moontlik 'n probleem met "
995 "die netwerkverbinding of die bediener. "
996
997-#: ../DistUpgrade/DistUpgradeFetcherCore.py:312
998-#: ../DistUpgrade/DistUpgradeFetcherCore.py:318
999+#: ../DistUpgrade/DistUpgradeFetcherCore.py:309
1000+#: ../DistUpgrade/DistUpgradeFetcherCore.py:315
1001 msgid "Can not run the upgrade"
1002 msgstr "Kan nie die opgradering loop nie"
1003
1004-#: ../DistUpgrade/DistUpgradeFetcherCore.py:313
1005+#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
1006 msgid ""
1007 "This usually is caused by a system where /tmp is mounted noexec. Please "
1008 "remount without noexec and run the upgrade again."
1009 msgstr ""
1010
1011-#: ../DistUpgrade/DistUpgradeFetcherCore.py:319
1012+#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
1013 #, python-format
1014 msgid "The error message is '%s'."
1015 msgstr "Die foutboodskap is '%s'."
1016
1017-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:68
1018-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:99
1019+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:70
1020+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:101
1021 msgid "Upgrade"
1022 msgstr "Gradeer op"
1023
1024-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:103
1025+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:105
1026 #: ../data/gtkbuilder/ReleaseNotes.ui.h:1
1027 msgid "Release Notes"
1028 msgstr ""
1029
1030-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:145
1031-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:158
1032+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:147
1033+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:160
1034 msgid "Downloading additional package files..."
1035 msgstr "Laai bykomende pakketlêers af..."
1036
1037-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:160
1038+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:162
1039 #, python-format
1040 msgid "File %s of %s at %sB/s"
1041 msgstr "Lêer %s van %s teen %sB/s"
1042
1043-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:164
1044+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:166
1045 #, python-format
1046 msgid "File %s of %s"
1047 msgstr "Lêer %s van %s"
1048
1049 #. print("mediaChange %s %s" % (medium, drive))
1050-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:171
1051+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:173
1052 #: ../DistUpgrade/DistUpgradeViewGtk.py:114
1053 #: ../DistUpgrade/DistUpgradeViewGtk3.py:115
1054 #: ../DistUpgrade/DistUpgradeViewKDE.py:196
1055@@ -836,8 +834,8 @@
1056
1057 #. change = QMessageBox.question(None, _("Media Change"), msg,
1058 #. QMessageBox.Ok, QMessageBox.Cancel)
1059-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:174
1060-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:175
1061+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:176
1062+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:177
1063 #: ../DistUpgrade/DistUpgradeViewKDE.py:197
1064 msgid "Media Change"
1065 msgstr "Media verwisseling"
1066@@ -857,7 +855,7 @@
1067 msgid "Your graphics hardware may not be fully supported in Ubuntu 13.04."
1068 msgstr ""
1069
1070-#: ../DistUpgrade/DistUpgradeQuirks.py:250
1071+#: ../DistUpgrade/DistUpgradeQuirks.py:248
1072 msgid ""
1073 "Running the 'unity' desktop environment is not fully supported by your "
1074 "graphics hardware. You will maybe end up in a very slow environment after "
1075@@ -867,20 +865,20 @@
1076 "want to continue with the upgrade?"
1077 msgstr ""
1078
1079+#: ../DistUpgrade/DistUpgradeQuirks.py:272
1080+msgid ""
1081+"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
1082+msgstr ""
1083+
1084 #: ../DistUpgrade/DistUpgradeQuirks.py:274
1085 msgid ""
1086-"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
1087-msgstr ""
1088-
1089-#: ../DistUpgrade/DistUpgradeQuirks.py:276
1090-msgid ""
1091 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
1092 "and you may encounter problems after the upgrade. For more information see "
1093 "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Do you want to "
1094 "continue with the upgrade?"
1095 msgstr ""
1096
1097-#: ../DistUpgrade/DistUpgradeQuirks.py:296
1098+#: ../DistUpgrade/DistUpgradeQuirks.py:294
1099 msgid ""
1100 "Upgrading may reduce desktop effects, and performance in games and other "
1101 "graphically intensive programs."
1102@@ -896,7 +894,7 @@
1103 "Do you want to continue?"
1104 msgstr ""
1105
1106-#: ../DistUpgrade/DistUpgradeQuirks.py:300
1107+#: ../DistUpgrade/DistUpgradeQuirks.py:298
1108 msgid ""
1109 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
1110 "of this driver is available that works with your hardware in Ubuntu 10.04 "
1111@@ -905,11 +903,11 @@
1112 "Do you want to continue?"
1113 msgstr ""
1114
1115-#: ../DistUpgrade/DistUpgradeQuirks.py:335
1116+#: ../DistUpgrade/DistUpgradeQuirks.py:333
1117 msgid "No i686 CPU"
1118 msgstr ""
1119
1120-#: ../DistUpgrade/DistUpgradeQuirks.py:336
1121+#: ../DistUpgrade/DistUpgradeQuirks.py:334
1122 msgid ""
1123 "Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
1124 "extension. All packages were built with optimizations requiring i686 as the "
1125@@ -917,11 +915,11 @@
1126 "Ubuntu release with this hardware."
1127 msgstr ""
1128
1129-#: ../DistUpgrade/DistUpgradeQuirks.py:372
1130+#: ../DistUpgrade/DistUpgradeQuirks.py:370
1131 msgid "No ARMv6 CPU"
1132 msgstr "Geen ARMv6 verwerker"
1133
1134-#: ../DistUpgrade/DistUpgradeQuirks.py:373
1135+#: ../DistUpgrade/DistUpgradeQuirks.py:371
1136 msgid ""
1137 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
1138 "packages in karmic were built with optimizations requiring ARMv6 as the "
1139@@ -929,11 +927,11 @@
1140 "Ubuntu release with this hardware."
1141 msgstr ""
1142
1143-#: ../DistUpgrade/DistUpgradeQuirks.py:393
1144+#: ../DistUpgrade/DistUpgradeQuirks.py:391
1145 msgid "No init available"
1146 msgstr ""
1147
1148-#: ../DistUpgrade/DistUpgradeQuirks.py:394
1149+#: ../DistUpgrade/DistUpgradeQuirks.py:392
1150 msgid ""
1151 "Your system appears to be a virtualised environment without an init daemon, "
1152 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
1153@@ -1670,41 +1668,41 @@
1154 "via the exit code"
1155 msgstr ""
1156
1157-#: ../do-release-upgrade:113
1158+#: ../do-release-upgrade:108
1159 msgid "Checking for a new Ubuntu release"
1160 msgstr ""
1161
1162-#: ../do-release-upgrade:125
1163+#: ../do-release-upgrade:121
1164 msgid "Your Ubuntu release is not supported anymore."
1165 msgstr ""
1166
1167-#: ../do-release-upgrade:126
1168+#: ../do-release-upgrade:122
1169 msgid ""
1170 "For upgrade information, please visit:\n"
1171 "%(url)s\n"
1172 msgstr ""
1173
1174-#: ../do-release-upgrade:132
1175+#: ../do-release-upgrade:128
1176 msgid "No new release found"
1177 msgstr ""
1178
1179-#: ../do-release-upgrade:137
1180+#: ../do-release-upgrade:133
1181 msgid "Release upgrade not possible right now"
1182 msgstr ""
1183
1184-#: ../do-release-upgrade:138
1185+#: ../do-release-upgrade:134
1186 #, c-format
1187 msgid ""
1188 "The release upgrade can not be performed currently, please try again later. "
1189 "The server reported: '%s'"
1190 msgstr ""
1191
1192-#: ../do-release-upgrade:144
1193+#: ../do-release-upgrade:140
1194 #, c-format
1195 msgid "New release '%s' available."
1196 msgstr ""
1197
1198-#: ../do-release-upgrade:145
1199+#: ../do-release-upgrade:141
1200 msgid "Run 'do-release-upgrade' to upgrade to it."
1201 msgstr ""
1202
1203
1204=== modified file 'po/am.po'
1205--- po/am.po 2014-04-07 14:07:10 +0000
1206+++ po/am.po 2021-05-11 08:09:06 +0000
1207@@ -15,12 +15,12 @@
1208 "Content-Type: text/plain; charset=UTF-8\n"
1209 "Content-Transfer-Encoding: 8bit\n"
1210 "Plural-Forms: nplurals=2; plural=n > 1;\n"
1211-"X-Launchpad-Export-Date: 2014-04-05 06:07+0000\n"
1212-"X-Generator: Launchpad (build 16976)\n"
1213+"X-Launchpad-Export-Date: 2014-04-23 06:50+0000\n"
1214+"X-Generator: Launchpad (build 16985)\n"
1215 "Language: am\n"
1216
1217 #. TRANSLATORS: %s is a country
1218-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
1219+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:441
1220 #, python-format
1221 msgid "Server for %s"
1222 msgstr "ሰርቨር ለ %s"
1223@@ -158,18 +158,19 @@
1224 msgid "Trying to install blacklisted version '%s'"
1225 msgstr "ለመግጠም በመሞከር ላይ በመጥፎ ዝርዝር እትም ውስጥ ካሉ '%s'"
1226
1227+#: ../DistUpgrade/DistUpgradeCache.py:859
1228+#, python-format
1229+msgid "Can't install '%s'"
1230+msgstr "መግጠም አልተቻለም '%s'"
1231+
1232 #: ../DistUpgrade/DistUpgradeCache.py:860
1233-#, python-format
1234-msgid "Can't install '%s'"
1235-msgstr "መግጠም አልተቻለም '%s'"
1236-
1237-#: ../DistUpgrade/DistUpgradeCache.py:861
1238 msgid ""
1239 "It was impossible to install a required package. Please report this as a bug "
1240 "using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
1241 msgstr ""
1242
1243-#: ../DistUpgrade/DistUpgradeCache.py:872
1244+#. FIXME: provide a list
1245+#: ../DistUpgrade/DistUpgradeCache.py:871
1246 msgid "Can't guess meta-package"
1247 msgstr "ስለ-ጥቅል መገመት አልተቻለም"
1248
1249@@ -360,35 +361,34 @@
1250 "will cancel."
1251 msgstr ""
1252
1253-#: ../DistUpgrade/DistUpgradeController.py:820
1254-#: ../DistUpgrade/DistUpgradeController.py:826
1255+#: ../DistUpgrade/DistUpgradeController.py:819
1256 msgid "Repository information invalid"
1257 msgstr "የማስቀመጫው መረጃ ዋጋ የለውም"
1258
1259-#: ../DistUpgrade/DistUpgradeController.py:821
1260+#: ../DistUpgrade/DistUpgradeController.py:820
1261 msgid ""
1262 "Upgrading the repository information resulted in a invalid file so a bug "
1263 "reporting process is being started."
1264 msgstr ""
1265
1266-#: ../DistUpgrade/DistUpgradeController.py:836
1267+#: ../DistUpgrade/DistUpgradeController.py:827
1268 msgid "Third party sources disabled"
1269 msgstr "የ3ኛ ፓርቲ ምንጮችን አለማስቻል"
1270
1271-#: ../DistUpgrade/DistUpgradeController.py:837
1272+#: ../DistUpgrade/DistUpgradeController.py:828
1273 msgid ""
1274 "Some third party entries in your sources.list were disabled. You can re-"
1275 "enable them after the upgrade with the 'software-properties' tool or your "
1276 "package manager."
1277 msgstr ""
1278
1279-#: ../DistUpgrade/DistUpgradeController.py:879
1280+#: ../DistUpgrade/DistUpgradeController.py:870
1281 msgid "Package in inconsistent state"
1282 msgid_plural "Packages in inconsistent state"
1283 msgstr[0] ""
1284 msgstr[1] ""
1285
1286-#: ../DistUpgrade/DistUpgradeController.py:882
1287+#: ../DistUpgrade/DistUpgradeController.py:873
1288 #, python-format
1289 msgid ""
1290 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
1291@@ -401,11 +401,11 @@
1292 msgstr[0] ""
1293 msgstr[1] ""
1294
1295-#: ../DistUpgrade/DistUpgradeController.py:930
1296+#: ../DistUpgrade/DistUpgradeController.py:921
1297 msgid "Error during update"
1298 msgstr "ስህተት በማሻሻል ላይ"
1299
1300-#: ../DistUpgrade/DistUpgradeController.py:931
1301+#: ../DistUpgrade/DistUpgradeController.py:922
1302 msgid ""
1303 "A problem occurred during the update. This is usually some sort of network "
1304 "problem, please check your network connection and retry."
1305@@ -413,11 +413,11 @@
1306 "ስህተት ተፈጥሯል በማሻሻል ላይ ፡ ይህ ምናልባት የኔትዎርክ ችግር ይሆናል ፡ እባክዎ የኔትዎርክ ግንኙነትዎን ይመርምሩና "
1307 "እንደገና ይሞክሩ"
1308
1309-#: ../DistUpgrade/DistUpgradeController.py:940
1310+#: ../DistUpgrade/DistUpgradeController.py:931
1311 msgid "Not enough free disk space"
1312 msgstr "በቂ ባዶ ቦታ ዲስኩ ላይ የለም"
1313
1314-#: ../DistUpgrade/DistUpgradeController.py:941
1315+#: ../DistUpgrade/DistUpgradeController.py:932
1316 #, python-format
1317 msgid ""
1318 "The upgrade has aborted. The upgrade needs a total of %s free space on disk "
1319@@ -428,32 +428,32 @@
1320
1321 #. calc the dist-upgrade and see if the removals are ok/expected
1322 #. do the dist-upgrade
1323-#: ../DistUpgrade/DistUpgradeController.py:970
1324-#: ../DistUpgrade/DistUpgradeController.py:1778
1325+#: ../DistUpgrade/DistUpgradeController.py:961
1326+#: ../DistUpgrade/DistUpgradeController.py:1743
1327 msgid "Calculating the changes"
1328 msgstr "ለውጦቹን በማስላት ላይ"
1329
1330 #. ask the user
1331-#: ../DistUpgrade/DistUpgradeController.py:1002
1332+#: ../DistUpgrade/DistUpgradeController.py:993
1333 msgid "Do you want to start the upgrade?"
1334 msgstr "ማሻሻሉን አሁን መጀመር ይፈልጋሉ?"
1335
1336-#: ../DistUpgrade/DistUpgradeController.py:1075
1337+#: ../DistUpgrade/DistUpgradeController.py:1066
1338 msgid "Upgrade canceled"
1339 msgstr "ማሻሻሉ ተሰርዟል"
1340
1341-#: ../DistUpgrade/DistUpgradeController.py:1076
1342+#: ../DistUpgrade/DistUpgradeController.py:1067
1343 msgid ""
1344 "The upgrade will cancel now and the original system state will be restored. "
1345 "You can resume the upgrade at a later time."
1346 msgstr ""
1347
1348-#: ../DistUpgrade/DistUpgradeController.py:1082
1349-#: ../DistUpgrade/DistUpgradeController.py:1206
1350+#: ../DistUpgrade/DistUpgradeController.py:1073
1351+#: ../DistUpgrade/DistUpgradeController.py:1197
1352 msgid "Could not download the upgrades"
1353 msgstr "የማሻሻያውን ጭነት ማውረድ አልተቻለም"
1354
1355-#: ../DistUpgrade/DistUpgradeController.py:1083
1356+#: ../DistUpgrade/DistUpgradeController.py:1074
1357 msgid ""
1358 "The upgrade has aborted. Please check your Internet connection or "
1359 "installation media and try again. All files downloaded so far have been kept."
1360@@ -461,33 +461,33 @@
1361
1362 #. FIXME: strings are not good, but we are in string freeze
1363 #. currently
1364-#: ../DistUpgrade/DistUpgradeController.py:1157
1365-#: ../DistUpgrade/DistUpgradeController.py:1194
1366-#: ../DistUpgrade/DistUpgradeController.py:1299
1367+#: ../DistUpgrade/DistUpgradeController.py:1148
1368+#: ../DistUpgrade/DistUpgradeController.py:1185
1369+#: ../DistUpgrade/DistUpgradeController.py:1290
1370 msgid "Error during commit"
1371 msgstr "በመፈጸም ላይ ስህተት"
1372
1373 #. generate a new cache
1374-#: ../DistUpgrade/DistUpgradeController.py:1159
1375-#: ../DistUpgrade/DistUpgradeController.py:1196
1376-#: ../DistUpgrade/DistUpgradeController.py:1338
1377+#: ../DistUpgrade/DistUpgradeController.py:1150
1378+#: ../DistUpgrade/DistUpgradeController.py:1187
1379+#: ../DistUpgrade/DistUpgradeController.py:1329
1380 msgid "Restoring original system state"
1381 msgstr "መጀመሪያ ወደነበረበት ስርአት መመለሰ"
1382
1383-#: ../DistUpgrade/DistUpgradeController.py:1160
1384-#: ../DistUpgrade/DistUpgradeController.py:1175
1385-#: ../DistUpgrade/DistUpgradeController.py:1197
1386+#: ../DistUpgrade/DistUpgradeController.py:1151
1387+#: ../DistUpgrade/DistUpgradeController.py:1166
1388+#: ../DistUpgrade/DistUpgradeController.py:1188
1389 msgid "Could not install the upgrades"
1390 msgstr "ማሻሻያውን መግጠም አልተቻለም"
1391
1392 #. invoke the frontend now and show a error message
1393-#: ../DistUpgrade/DistUpgradeController.py:1165
1394+#: ../DistUpgrade/DistUpgradeController.py:1156
1395 msgid ""
1396 "The upgrade has aborted. Your system could be in an unusable state. A "
1397 "recovery will run now (dpkg --configure -a)."
1398 msgstr ""
1399
1400-#: ../DistUpgrade/DistUpgradeController.py:1170
1401+#: ../DistUpgrade/DistUpgradeController.py:1161
1402 #, python-format
1403 msgid ""
1404 "\n"
1405@@ -498,26 +498,26 @@
1406 "%s"
1407 msgstr ""
1408
1409-#: ../DistUpgrade/DistUpgradeController.py:1207
1410+#: ../DistUpgrade/DistUpgradeController.py:1198
1411 msgid ""
1412 "The upgrade has aborted. Please check your Internet connection or "
1413 "installation media and try again. "
1414 msgstr ""
1415
1416-#: ../DistUpgrade/DistUpgradeController.py:1287
1417+#: ../DistUpgrade/DistUpgradeController.py:1278
1418 msgid "Remove obsolete packages?"
1419 msgstr "ላስወግዳቸው አሮጌ ጥቅሎችን?"
1420
1421-#: ../DistUpgrade/DistUpgradeController.py:1288
1422+#: ../DistUpgrade/DistUpgradeController.py:1279
1423 #: ../data/gtkbuilder/DistUpgrade.ui.h:8
1424 msgid "_Keep"
1425 msgstr "_ማስቀመጥ"
1426
1427-#: ../DistUpgrade/DistUpgradeController.py:1288
1428+#: ../DistUpgrade/DistUpgradeController.py:1279
1429 msgid "_Remove"
1430 msgstr "_ማስወገጃ"
1431
1432-#: ../DistUpgrade/DistUpgradeController.py:1300
1433+#: ../DistUpgrade/DistUpgradeController.py:1291
1434 msgid ""
1435 "A problem occurred during the clean-up. Please see the below message for "
1436 "more information. "
1437@@ -525,39 +525,37 @@
1438
1439 #. FIXME: instead of error out, fetch and install it
1440 #. here
1441-#: ../DistUpgrade/DistUpgradeController.py:1376
1442+#: ../DistUpgrade/DistUpgradeController.py:1367
1443 msgid "Required depends is not installed"
1444 msgstr "የሚያስፈልጉት ጥገኞች አልተገጠሙም"
1445
1446-#: ../DistUpgrade/DistUpgradeController.py:1377
1447+#: ../DistUpgrade/DistUpgradeController.py:1368
1448 #, python-format
1449 msgid "The required dependency '%s' is not installed. "
1450 msgstr "የሚያስፈልጉት ጥገኞች '%s' አልተገጠሙም "
1451
1452 #. sanity check (check for ubuntu-desktop, brokenCache etc)
1453 #. then open the cache (again)
1454-#: ../DistUpgrade/DistUpgradeController.py:1645
1455-#: ../DistUpgrade/DistUpgradeController.py:1732
1456+#: ../DistUpgrade/DistUpgradeController.py:1636
1457+#: ../DistUpgrade/DistUpgradeController.py:1701
1458 msgid "Checking package manager"
1459 msgstr "የጥቅል አስተዳዳሪን በመመርመር ላይ"
1460
1461-#: ../DistUpgrade/DistUpgradeController.py:1651
1462-#: ../DistUpgrade/DistUpgradeController.py:1657
1463+#: ../DistUpgrade/DistUpgradeController.py:1641
1464 msgid "Preparing the upgrade failed"
1465 msgstr "ማሻሻያውን ማሰናዳት አልተቻለም"
1466
1467-#: ../DistUpgrade/DistUpgradeController.py:1652
1468+#: ../DistUpgrade/DistUpgradeController.py:1642
1469 msgid ""
1470 "Preparing the system for the upgrade failed so a bug reporting process is "
1471 "being started."
1472 msgstr ""
1473
1474-#: ../DistUpgrade/DistUpgradeController.py:1675
1475-#: ../DistUpgrade/DistUpgradeController.py:1685
1476+#: ../DistUpgrade/DistUpgradeController.py:1656
1477 msgid "Getting upgrade prerequisites failed"
1478 msgstr ""
1479
1480-#: ../DistUpgrade/DistUpgradeController.py:1676
1481+#: ../DistUpgrade/DistUpgradeController.py:1657
1482 msgid ""
1483 "The system was unable to get the prerequisites for the upgrade. The upgrade "
1484 "will abort now and restore the original system state.\n"
1485@@ -565,23 +563,23 @@
1486 "Additionally, a bug reporting process is being started."
1487 msgstr ""
1488
1489-#: ../DistUpgrade/DistUpgradeController.py:1716
1490+#: ../DistUpgrade/DistUpgradeController.py:1685
1491 msgid "Updating repository information"
1492 msgstr "የማስቀመጫውን መረጃ በማሻሻል ላይ"
1493
1494-#: ../DistUpgrade/DistUpgradeController.py:1723
1495+#: ../DistUpgrade/DistUpgradeController.py:1692
1496 msgid "Failed to add the cdrom"
1497 msgstr "ሲዲ ራም መጨመር አልተቻለም"
1498
1499-#: ../DistUpgrade/DistUpgradeController.py:1724
1500+#: ../DistUpgrade/DistUpgradeController.py:1693
1501 msgid "Sorry, adding the cdrom was not successful."
1502 msgstr "አዝናለሁ ሲዲ ራም መጨመሩ አልተሳካም"
1503
1504-#: ../DistUpgrade/DistUpgradeController.py:1755
1505+#: ../DistUpgrade/DistUpgradeController.py:1724
1506 msgid "Invalid package information"
1507 msgstr "ዋጋ የሌለው የጥቅል መረጃ"
1508
1509-#: ../DistUpgrade/DistUpgradeController.py:1756
1510+#: ../DistUpgrade/DistUpgradeController.py:1725
1511 #, python-format
1512 msgid ""
1513 "After updating your package information, the essential package '%s' could "
1514@@ -593,60 +591,60 @@
1515 "later."
1516 msgstr ""
1517
1518-#: ../DistUpgrade/DistUpgradeController.py:1784
1519-#: ../DistUpgrade/DistUpgradeController.py:1840
1520+#: ../DistUpgrade/DistUpgradeController.py:1749
1521+#: ../DistUpgrade/DistUpgradeController.py:1805
1522 msgid "Fetching"
1523 msgstr "ሄዶ ማምጣት"
1524
1525-#: ../DistUpgrade/DistUpgradeController.py:1790
1526-#: ../DistUpgrade/DistUpgradeController.py:1844
1527+#: ../DistUpgrade/DistUpgradeController.py:1755
1528+#: ../DistUpgrade/DistUpgradeController.py:1809
1529 msgid "Upgrading"
1530 msgstr "በማሻሻል ላይ"
1531
1532 #. don't abort here, because it would restore the sources.list
1533-#: ../DistUpgrade/DistUpgradeController.py:1795
1534-#: ../DistUpgrade/DistUpgradeController.py:1846
1535-#: ../DistUpgrade/DistUpgradeController.py:1853
1536-#: ../DistUpgrade/DistUpgradeController.py:1864
1537+#: ../DistUpgrade/DistUpgradeController.py:1760
1538+#: ../DistUpgrade/DistUpgradeController.py:1811
1539+#: ../DistUpgrade/DistUpgradeController.py:1818
1540+#: ../DistUpgrade/DistUpgradeController.py:1829
1541 msgid "Upgrade complete"
1542 msgstr "ማሻሻሉ ተጠናቋል"
1543
1544-#: ../DistUpgrade/DistUpgradeController.py:1796
1545-#: ../DistUpgrade/DistUpgradeController.py:1847
1546-#: ../DistUpgrade/DistUpgradeController.py:1854
1547+#: ../DistUpgrade/DistUpgradeController.py:1761
1548+#: ../DistUpgrade/DistUpgradeController.py:1812
1549+#: ../DistUpgrade/DistUpgradeController.py:1819
1550 msgid ""
1551 "The upgrade has completed but there were errors during the upgrade process."
1552 msgstr ""
1553
1554-#: ../DistUpgrade/DistUpgradeController.py:1803
1555+#: ../DistUpgrade/DistUpgradeController.py:1768
1556 msgid "Searching for obsolete software"
1557 msgstr "ጊዜው ያለፈበትን ሶፍትዌር በመፈለግ ላይ"
1558
1559-#: ../DistUpgrade/DistUpgradeController.py:1816
1560+#: ../DistUpgrade/DistUpgradeController.py:1781
1561 msgid "System upgrade is complete."
1562 msgstr "ስርአቱን ማሻሻል ተጠናቋል"
1563
1564-#: ../DistUpgrade/DistUpgradeController.py:1865
1565+#: ../DistUpgrade/DistUpgradeController.py:1830
1566 msgid "The partial upgrade was completed."
1567 msgstr "በከፊል ማሻሻሉ ተጠናቋል"
1568
1569 #: ../DistUpgrade/DistUpgradeFetcher.py:123
1570-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:117
1571+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:119
1572 msgid "Could not find the release notes"
1573 msgstr "የመልቀቂያ ማስታወሻዎችን ማግኘት አልተቻለም"
1574
1575 #: ../DistUpgrade/DistUpgradeFetcher.py:124
1576-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:118
1577+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:120
1578 msgid "The server may be overloaded. "
1579 msgstr "ሰርቨሩ ምናልባት ካቅሙ በላይ ተጭኗል "
1580
1581 #: ../DistUpgrade/DistUpgradeFetcher.py:136
1582-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:122
1583+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:124
1584 msgid "Could not download the release notes"
1585 msgstr "የመልቀቂያ ማስታወሻዎችን ማውረድ አልተቻለም"
1586
1587 #: ../DistUpgrade/DistUpgradeFetcher.py:137
1588-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:123
1589+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:125
1590 msgid "Please check your internet connection."
1591 msgstr "እባክዎ የኢንተርኔት ግንኙነትዎን ይመርምሩ"
1592
1593@@ -655,111 +653,111 @@
1594 msgid "authenticate '%(file)s' against '%(signature)s' "
1595 msgstr ""
1596
1597-#: ../DistUpgrade/DistUpgradeFetcherCore.py:139
1598+#: ../DistUpgrade/DistUpgradeFetcherCore.py:136
1599 #, python-format
1600 msgid "extracting '%s'"
1601 msgstr ""
1602
1603-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
1604-#: ../DistUpgrade/DistUpgradeFetcherCore.py:161
1605+#: ../DistUpgrade/DistUpgradeFetcherCore.py:157
1606+#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
1607 msgid "Could not run the upgrade tool"
1608 msgstr "የማሻሻያውን መሳሪያዎች ማስኬድ አልተቻለም"
1609
1610-#: ../DistUpgrade/DistUpgradeFetcherCore.py:162
1611+#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
1612 msgid ""
1613 "This is most likely a bug in the upgrade tool. Please report it as a bug "
1614 "using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
1615 msgstr ""
1616
1617-#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
1618+#: ../DistUpgrade/DistUpgradeFetcherCore.py:236
1619 msgid "Upgrade tool signature"
1620 msgstr "የማሻሻያዎች መሳሪያዎች ፊርማ"
1621
1622-#: ../DistUpgrade/DistUpgradeFetcherCore.py:246
1623+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
1624 msgid "Upgrade tool"
1625 msgstr "ማሻሻያ መሳሪያዎች"
1626
1627-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
1628+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
1629 msgid "Failed to fetch"
1630 msgstr "ሄዶ ማምጣት ወድቋል"
1631
1632-#: ../DistUpgrade/DistUpgradeFetcherCore.py:281
1633+#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
1634 msgid "Fetching the upgrade failed. There may be a network problem. "
1635 msgstr "ማሻሻያውን ሄዶ ማምጣት ወድቋል ፤ ምናልባት የኔትዎርክ ችግር ሊሆን ይችላል "
1636
1637-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
1638+#: ../DistUpgrade/DistUpgradeFetcherCore.py:282
1639 msgid "Authentication failed"
1640 msgstr "ማጽደቂያው ወድቋል"
1641
1642-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
1643+#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
1644 msgid ""
1645 "Authenticating the upgrade failed. There may be a problem with the network "
1646 "or with the server. "
1647 msgstr ""
1648
1649-#: ../DistUpgrade/DistUpgradeFetcherCore.py:291
1650+#: ../DistUpgrade/DistUpgradeFetcherCore.py:288
1651 msgid "Failed to extract"
1652 msgstr "ለይቶ ማውጣት ወድቋል"
1653
1654-#: ../DistUpgrade/DistUpgradeFetcherCore.py:292
1655+#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
1656 msgid ""
1657 "Extracting the upgrade failed. There may be a problem with the network or "
1658 "with the server. "
1659 msgstr "ማሻሻያውን ለይቶ ማውጣት ወድቋል ፤ ምናልባት የኔትዎርክ ወይም የሰርቨር ችግር ሊሆን ይችላል "
1660
1661-#: ../DistUpgrade/DistUpgradeFetcherCore.py:297
1662+#: ../DistUpgrade/DistUpgradeFetcherCore.py:294
1663 msgid "Verification failed"
1664 msgstr "ማረጋገጫው ወድቋል"
1665
1666-#: ../DistUpgrade/DistUpgradeFetcherCore.py:298
1667+#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
1668 msgid ""
1669 "Verifying the upgrade failed. There may be a problem with the network or "
1670 "with the server. "
1671 msgstr ""
1672
1673-#: ../DistUpgrade/DistUpgradeFetcherCore.py:312
1674-#: ../DistUpgrade/DistUpgradeFetcherCore.py:318
1675+#: ../DistUpgrade/DistUpgradeFetcherCore.py:309
1676+#: ../DistUpgrade/DistUpgradeFetcherCore.py:315
1677 msgid "Can not run the upgrade"
1678 msgstr "ማሻሻያውን ማስኬድ አልተቻለም"
1679
1680-#: ../DistUpgrade/DistUpgradeFetcherCore.py:313
1681+#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
1682 msgid ""
1683 "This usually is caused by a system where /tmp is mounted noexec. Please "
1684 "remount without noexec and run the upgrade again."
1685 msgstr ""
1686
1687-#: ../DistUpgrade/DistUpgradeFetcherCore.py:319
1688+#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
1689 #, python-format
1690 msgid "The error message is '%s'."
1691 msgstr "የስህተቱ መልእክት ነው '%s'."
1692
1693-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:68
1694-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:99
1695+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:70
1696+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:101
1697 msgid "Upgrade"
1698 msgstr "ማሻሻል"
1699
1700-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:103
1701+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:105
1702 #: ../data/gtkbuilder/ReleaseNotes.ui.h:1
1703 msgid "Release Notes"
1704 msgstr "የተለቀቀ ማስታወሻ"
1705
1706-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:145
1707-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:158
1708+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:147
1709+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:160
1710 msgid "Downloading additional package files..."
1711 msgstr "ጭነት ማውረድ ተጨማሪ የጥቅል ፋይሎች"
1712
1713-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:160
1714+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:162
1715 #, python-format
1716 msgid "File %s of %s at %sB/s"
1717 msgstr "ፋይል %s ከ %s በ %sB/s"
1718
1719-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:164
1720+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:166
1721 #, python-format
1722 msgid "File %s of %s"
1723 msgstr "ፋይል %s ከ %s"
1724
1725 #. print("mediaChange %s %s" % (medium, drive))
1726-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:171
1727+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:173
1728 #: ../DistUpgrade/DistUpgradeViewGtk.py:114
1729 #: ../DistUpgrade/DistUpgradeViewGtk3.py:115
1730 #: ../DistUpgrade/DistUpgradeViewKDE.py:196
1731@@ -769,8 +767,8 @@
1732
1733 #. change = QMessageBox.question(None, _("Media Change"), msg,
1734 #. QMessageBox.Ok, QMessageBox.Cancel)
1735-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:174
1736-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:175
1737+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:176
1738+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:177
1739 #: ../DistUpgrade/DistUpgradeViewKDE.py:197
1740 msgid "Media Change"
1741 msgstr "የሜዲያ ለውጥ"
1742@@ -790,7 +788,7 @@
1743 msgid "Your graphics hardware may not be fully supported in Ubuntu 13.04."
1744 msgstr ""
1745
1746-#: ../DistUpgrade/DistUpgradeQuirks.py:250
1747+#: ../DistUpgrade/DistUpgradeQuirks.py:248
1748 msgid ""
1749 "Running the 'unity' desktop environment is not fully supported by your "
1750 "graphics hardware. You will maybe end up in a very slow environment after "
1751@@ -800,20 +798,20 @@
1752 "want to continue with the upgrade?"
1753 msgstr ""
1754
1755+#: ../DistUpgrade/DistUpgradeQuirks.py:272
1756+msgid ""
1757+"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
1758+msgstr ""
1759+
1760 #: ../DistUpgrade/DistUpgradeQuirks.py:274
1761 msgid ""
1762-"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
1763-msgstr ""
1764-
1765-#: ../DistUpgrade/DistUpgradeQuirks.py:276
1766-msgid ""
1767 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
1768 "and you may encounter problems after the upgrade. For more information see "
1769 "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Do you want to "
1770 "continue with the upgrade?"
1771 msgstr ""
1772
1773-#: ../DistUpgrade/DistUpgradeQuirks.py:296
1774+#: ../DistUpgrade/DistUpgradeQuirks.py:294
1775 msgid ""
1776 "Upgrading may reduce desktop effects, and performance in games and other "
1777 "graphically intensive programs."
1778@@ -829,7 +827,7 @@
1779 "Do you want to continue?"
1780 msgstr ""
1781
1782-#: ../DistUpgrade/DistUpgradeQuirks.py:300
1783+#: ../DistUpgrade/DistUpgradeQuirks.py:298
1784 msgid ""
1785 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
1786 "of this driver is available that works with your hardware in Ubuntu 10.04 "
1787@@ -838,11 +836,11 @@
1788 "Do you want to continue?"
1789 msgstr ""
1790
1791-#: ../DistUpgrade/DistUpgradeQuirks.py:335
1792+#: ../DistUpgrade/DistUpgradeQuirks.py:333
1793 msgid "No i686 CPU"
1794 msgstr "i686 ሲፒዩ አይደለም"
1795
1796-#: ../DistUpgrade/DistUpgradeQuirks.py:336
1797+#: ../DistUpgrade/DistUpgradeQuirks.py:334
1798 msgid ""
1799 "Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
1800 "extension. All packages were built with optimizations requiring i686 as the "
1801@@ -850,11 +848,11 @@
1802 "Ubuntu release with this hardware."
1803 msgstr ""
1804
1805-#: ../DistUpgrade/DistUpgradeQuirks.py:372
1806+#: ../DistUpgrade/DistUpgradeQuirks.py:370
1807 msgid "No ARMv6 CPU"
1808 msgstr ""
1809
1810-#: ../DistUpgrade/DistUpgradeQuirks.py:373
1811+#: ../DistUpgrade/DistUpgradeQuirks.py:371
1812 msgid ""
1813 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
1814 "packages in karmic were built with optimizations requiring ARMv6 as the "
1815@@ -862,11 +860,11 @@
1816 "Ubuntu release with this hardware."
1817 msgstr ""
1818
1819-#: ../DistUpgrade/DistUpgradeQuirks.py:393
1820+#: ../DistUpgrade/DistUpgradeQuirks.py:391
1821 msgid "No init available"
1822 msgstr ""
1823
1824-#: ../DistUpgrade/DistUpgradeQuirks.py:394
1825+#: ../DistUpgrade/DistUpgradeQuirks.py:392
1826 msgid ""
1827 "Your system appears to be a virtualised environment without an init daemon, "
1828 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
1829@@ -1598,15 +1596,15 @@
1830 "via the exit code"
1831 msgstr ""
1832
1833-#: ../do-release-upgrade:113
1834+#: ../do-release-upgrade:108
1835 msgid "Checking for a new Ubuntu release"
1836 msgstr ""
1837
1838-#: ../do-release-upgrade:125
1839+#: ../do-release-upgrade:121
1840 msgid "Your Ubuntu release is not supported anymore."
1841 msgstr "የእርስዎ ኡቡንቱ የተደገፈ አይደለም"
1842
1843-#: ../do-release-upgrade:126
1844+#: ../do-release-upgrade:122
1845 msgid ""
1846 "For upgrade information, please visit:\n"
1847 "%(url)s\n"
1848@@ -1614,27 +1612,27 @@
1849 "ላማሻሻያ መረጃ እባክዎን ይህን ይጎብኙ :\n"
1850 "%(url)s\n"
1851
1852-#: ../do-release-upgrade:132
1853+#: ../do-release-upgrade:128
1854 msgid "No new release found"
1855 msgstr "አዲስ የተለቀቀ እትም የለም"
1856
1857-#: ../do-release-upgrade:137
1858+#: ../do-release-upgrade:133
1859 msgid "Release upgrade not possible right now"
1860 msgstr ""
1861
1862-#: ../do-release-upgrade:138
1863+#: ../do-release-upgrade:134
1864 #, c-format
1865 msgid ""
1866 "The release upgrade can not be performed currently, please try again later. "
1867 "The server reported: '%s'"
1868 msgstr ""
1869
1870-#: ../do-release-upgrade:144
1871+#: ../do-release-upgrade:140
1872 #, c-format
1873 msgid "New release '%s' available."
1874 msgstr "አዲሱ እትም '%s' ዝግጁ ነው"
1875
1876-#: ../do-release-upgrade:145
1877+#: ../do-release-upgrade:141
1878 msgid "Run 'do-release-upgrade' to upgrade to it."
1879 msgstr ""
1880
1881
1882=== modified file 'po/an.po'
1883--- po/an.po 2014-04-07 14:07:10 +0000
1884+++ po/an.po 2021-05-11 08:09:06 +0000
1885@@ -15,12 +15,12 @@
1886 "Content-Type: text/plain; charset=UTF-8\n"
1887 "Content-Transfer-Encoding: 8bit\n"
1888 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1889-"X-Launchpad-Export-Date: 2014-04-05 06:07+0000\n"
1890-"X-Generator: Launchpad (build 16976)\n"
1891+"X-Launchpad-Export-Date: 2014-04-23 06:50+0000\n"
1892+"X-Generator: Launchpad (build 16985)\n"
1893 "Language: an\n"
1894
1895 #. TRANSLATORS: %s is a country
1896-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
1897+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:441
1898 #, python-format
1899 msgid "Server for %s"
1900 msgstr "Servidor ta %s"
1901@@ -178,18 +178,19 @@
1902 msgid "Trying to install blacklisted version '%s'"
1903 msgstr "Prebando d'instalar a versión vedada «%s»"
1904
1905-#: ../DistUpgrade/DistUpgradeCache.py:860
1906+#: ../DistUpgrade/DistUpgradeCache.py:859
1907 #, python-format
1908 msgid "Can't install '%s'"
1909 msgstr "No se ha puesto instalar «%s»"
1910
1911-#: ../DistUpgrade/DistUpgradeCache.py:861
1912+#: ../DistUpgrade/DistUpgradeCache.py:860
1913 msgid ""
1914 "It was impossible to install a required package. Please report this as a bug "
1915 "using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
1916 msgstr ""
1917
1918-#: ../DistUpgrade/DistUpgradeCache.py:872
1919+#. FIXME: provide a list
1920+#: ../DistUpgrade/DistUpgradeCache.py:871
1921 msgid "Can't guess meta-package"
1922 msgstr "No s'ha puesto determinar o meta-paquet"
1923
1924@@ -407,35 +408,34 @@
1925 "will cancel."
1926 msgstr ""
1927
1928+#: ../DistUpgrade/DistUpgradeController.py:819
1929+msgid "Repository information invalid"
1930+msgstr ""
1931+
1932 #: ../DistUpgrade/DistUpgradeController.py:820
1933-#: ../DistUpgrade/DistUpgradeController.py:826
1934-msgid "Repository information invalid"
1935-msgstr ""
1936-
1937-#: ../DistUpgrade/DistUpgradeController.py:821
1938 msgid ""
1939 "Upgrading the repository information resulted in a invalid file so a bug "
1940 "reporting process is being started."
1941 msgstr ""
1942
1943-#: ../DistUpgrade/DistUpgradeController.py:836
1944+#: ../DistUpgrade/DistUpgradeController.py:827
1945 msgid "Third party sources disabled"
1946 msgstr ""
1947
1948-#: ../DistUpgrade/DistUpgradeController.py:837
1949+#: ../DistUpgrade/DistUpgradeController.py:828
1950 msgid ""
1951 "Some third party entries in your sources.list were disabled. You can re-"
1952 "enable them after the upgrade with the 'software-properties' tool or your "
1953 "package manager."
1954 msgstr ""
1955
1956-#: ../DistUpgrade/DistUpgradeController.py:879
1957+#: ../DistUpgrade/DistUpgradeController.py:870
1958 msgid "Package in inconsistent state"
1959 msgid_plural "Packages in inconsistent state"
1960 msgstr[0] ""
1961 msgstr[1] ""
1962
1963-#: ../DistUpgrade/DistUpgradeController.py:882
1964+#: ../DistUpgrade/DistUpgradeController.py:873
1965 #, python-format
1966 msgid ""
1967 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
1968@@ -448,21 +448,21 @@
1969 msgstr[0] ""
1970 msgstr[1] ""
1971
1972-#: ../DistUpgrade/DistUpgradeController.py:930
1973+#: ../DistUpgrade/DistUpgradeController.py:921
1974 msgid "Error during update"
1975 msgstr ""
1976
1977-#: ../DistUpgrade/DistUpgradeController.py:931
1978+#: ../DistUpgrade/DistUpgradeController.py:922
1979 msgid ""
1980 "A problem occurred during the update. This is usually some sort of network "
1981 "problem, please check your network connection and retry."
1982 msgstr ""
1983
1984-#: ../DistUpgrade/DistUpgradeController.py:940
1985+#: ../DistUpgrade/DistUpgradeController.py:931
1986 msgid "Not enough free disk space"
1987 msgstr ""
1988
1989-#: ../DistUpgrade/DistUpgradeController.py:941
1990+#: ../DistUpgrade/DistUpgradeController.py:932
1991 #, python-format
1992 msgid ""
1993 "The upgrade has aborted. The upgrade needs a total of %s free space on disk "
1994@@ -473,32 +473,32 @@
1995
1996 #. calc the dist-upgrade and see if the removals are ok/expected
1997 #. do the dist-upgrade
1998-#: ../DistUpgrade/DistUpgradeController.py:970
1999-#: ../DistUpgrade/DistUpgradeController.py:1778
2000+#: ../DistUpgrade/DistUpgradeController.py:961
2001+#: ../DistUpgrade/DistUpgradeController.py:1743
2002 msgid "Calculating the changes"
2003 msgstr ""
2004
2005 #. ask the user
2006-#: ../DistUpgrade/DistUpgradeController.py:1002
2007+#: ../DistUpgrade/DistUpgradeController.py:993
2008 msgid "Do you want to start the upgrade?"
2009 msgstr ""
2010
2011-#: ../DistUpgrade/DistUpgradeController.py:1075
2012+#: ../DistUpgrade/DistUpgradeController.py:1066
2013 msgid "Upgrade canceled"
2014 msgstr ""
2015
2016-#: ../DistUpgrade/DistUpgradeController.py:1076
2017+#: ../DistUpgrade/DistUpgradeController.py:1067
2018 msgid ""
2019 "The upgrade will cancel now and the original system state will be restored. "
2020 "You can resume the upgrade at a later time."
2021 msgstr ""
2022
2023-#: ../DistUpgrade/DistUpgradeController.py:1082
2024-#: ../DistUpgrade/DistUpgradeController.py:1206
2025+#: ../DistUpgrade/DistUpgradeController.py:1073
2026+#: ../DistUpgrade/DistUpgradeController.py:1197
2027 msgid "Could not download the upgrades"
2028 msgstr ""
2029
2030-#: ../DistUpgrade/DistUpgradeController.py:1083
2031+#: ../DistUpgrade/DistUpgradeController.py:1074
2032 msgid ""
2033 "The upgrade has aborted. Please check your Internet connection or "
2034 "installation media and try again. All files downloaded so far have been kept."
2035@@ -506,33 +506,33 @@
2036
2037 #. FIXME: strings are not good, but we are in string freeze
2038 #. currently
2039-#: ../DistUpgrade/DistUpgradeController.py:1157
2040-#: ../DistUpgrade/DistUpgradeController.py:1194
2041-#: ../DistUpgrade/DistUpgradeController.py:1299
2042+#: ../DistUpgrade/DistUpgradeController.py:1148
2043+#: ../DistUpgrade/DistUpgradeController.py:1185
2044+#: ../DistUpgrade/DistUpgradeController.py:1290
2045 msgid "Error during commit"
2046 msgstr ""
2047
2048 #. generate a new cache
2049-#: ../DistUpgrade/DistUpgradeController.py:1159
2050-#: ../DistUpgrade/DistUpgradeController.py:1196
2051-#: ../DistUpgrade/DistUpgradeController.py:1338
2052+#: ../DistUpgrade/DistUpgradeController.py:1150
2053+#: ../DistUpgrade/DistUpgradeController.py:1187
2054+#: ../DistUpgrade/DistUpgradeController.py:1329
2055 msgid "Restoring original system state"
2056 msgstr ""
2057
2058-#: ../DistUpgrade/DistUpgradeController.py:1160
2059-#: ../DistUpgrade/DistUpgradeController.py:1175
2060-#: ../DistUpgrade/DistUpgradeController.py:1197
2061+#: ../DistUpgrade/DistUpgradeController.py:1151
2062+#: ../DistUpgrade/DistUpgradeController.py:1166
2063+#: ../DistUpgrade/DistUpgradeController.py:1188
2064 msgid "Could not install the upgrades"
2065 msgstr ""
2066
2067 #. invoke the frontend now and show a error message
2068-#: ../DistUpgrade/DistUpgradeController.py:1165
2069+#: ../DistUpgrade/DistUpgradeController.py:1156
2070 msgid ""
2071 "The upgrade has aborted. Your system could be in an unusable state. A "
2072 "recovery will run now (dpkg --configure -a)."
2073 msgstr ""
2074
2075-#: ../DistUpgrade/DistUpgradeController.py:1170
2076+#: ../DistUpgrade/DistUpgradeController.py:1161
2077 #, python-format
2078 msgid ""
2079 "\n"
2080@@ -543,26 +543,26 @@
2081 "%s"
2082 msgstr ""
2083
2084-#: ../DistUpgrade/DistUpgradeController.py:1207
2085+#: ../DistUpgrade/DistUpgradeController.py:1198
2086 msgid ""
2087 "The upgrade has aborted. Please check your Internet connection or "
2088 "installation media and try again. "
2089 msgstr ""
2090
2091-#: ../DistUpgrade/DistUpgradeController.py:1287
2092+#: ../DistUpgrade/DistUpgradeController.py:1278
2093 msgid "Remove obsolete packages?"
2094 msgstr ""
2095
2096-#: ../DistUpgrade/DistUpgradeController.py:1288
2097+#: ../DistUpgrade/DistUpgradeController.py:1279
2098 #: ../data/gtkbuilder/DistUpgrade.ui.h:8
2099 msgid "_Keep"
2100 msgstr ""
2101
2102-#: ../DistUpgrade/DistUpgradeController.py:1288
2103+#: ../DistUpgrade/DistUpgradeController.py:1279
2104 msgid "_Remove"
2105 msgstr ""
2106
2107-#: ../DistUpgrade/DistUpgradeController.py:1300
2108+#: ../DistUpgrade/DistUpgradeController.py:1291
2109 msgid ""
2110 "A problem occurred during the clean-up. Please see the below message for "
2111 "more information. "
2112@@ -570,39 +570,37 @@
2113
2114 #. FIXME: instead of error out, fetch and install it
2115 #. here
2116-#: ../DistUpgrade/DistUpgradeController.py:1376
2117+#: ../DistUpgrade/DistUpgradeController.py:1367
2118 msgid "Required depends is not installed"
2119 msgstr ""
2120
2121-#: ../DistUpgrade/DistUpgradeController.py:1377
2122+#: ../DistUpgrade/DistUpgradeController.py:1368
2123 #, python-format
2124 msgid "The required dependency '%s' is not installed. "
2125 msgstr ""
2126
2127 #. sanity check (check for ubuntu-desktop, brokenCache etc)
2128 #. then open the cache (again)
2129-#: ../DistUpgrade/DistUpgradeController.py:1645
2130-#: ../DistUpgrade/DistUpgradeController.py:1732
2131+#: ../DistUpgrade/DistUpgradeController.py:1636
2132+#: ../DistUpgrade/DistUpgradeController.py:1701
2133 msgid "Checking package manager"
2134 msgstr ""
2135
2136-#: ../DistUpgrade/DistUpgradeController.py:1651
2137-#: ../DistUpgrade/DistUpgradeController.py:1657
2138+#: ../DistUpgrade/DistUpgradeController.py:1641
2139 msgid "Preparing the upgrade failed"
2140 msgstr ""
2141
2142-#: ../DistUpgrade/DistUpgradeController.py:1652
2143+#: ../DistUpgrade/DistUpgradeController.py:1642
2144 msgid ""
2145 "Preparing the system for the upgrade failed so a bug reporting process is "
2146 "being started."
2147 msgstr ""
2148
2149-#: ../DistUpgrade/DistUpgradeController.py:1675
2150-#: ../DistUpgrade/DistUpgradeController.py:1685
2151+#: ../DistUpgrade/DistUpgradeController.py:1656
2152 msgid "Getting upgrade prerequisites failed"
2153 msgstr ""
2154
2155-#: ../DistUpgrade/DistUpgradeController.py:1676
2156+#: ../DistUpgrade/DistUpgradeController.py:1657
2157 msgid ""
2158 "The system was unable to get the prerequisites for the upgrade. The upgrade "
2159 "will abort now and restore the original system state.\n"
2160@@ -610,23 +608,23 @@
2161 "Additionally, a bug reporting process is being started."
2162 msgstr ""
2163
2164-#: ../DistUpgrade/DistUpgradeController.py:1716
2165+#: ../DistUpgrade/DistUpgradeController.py:1685
2166 msgid "Updating repository information"
2167 msgstr ""
2168
2169-#: ../DistUpgrade/DistUpgradeController.py:1723
2170+#: ../DistUpgrade/DistUpgradeController.py:1692
2171 msgid "Failed to add the cdrom"
2172 msgstr ""
2173
2174+#: ../DistUpgrade/DistUpgradeController.py:1693
2175+msgid "Sorry, adding the cdrom was not successful."
2176+msgstr ""
2177+
2178 #: ../DistUpgrade/DistUpgradeController.py:1724
2179-msgid "Sorry, adding the cdrom was not successful."
2180-msgstr ""
2181-
2182-#: ../DistUpgrade/DistUpgradeController.py:1755
2183 msgid "Invalid package information"
2184 msgstr ""
2185
2186-#: ../DistUpgrade/DistUpgradeController.py:1756
2187+#: ../DistUpgrade/DistUpgradeController.py:1725
2188 #, python-format
2189 msgid ""
2190 "After updating your package information, the essential package '%s' could "
2191@@ -638,60 +636,60 @@
2192 "later."
2193 msgstr ""
2194
2195-#: ../DistUpgrade/DistUpgradeController.py:1784
2196-#: ../DistUpgrade/DistUpgradeController.py:1840
2197+#: ../DistUpgrade/DistUpgradeController.py:1749
2198+#: ../DistUpgrade/DistUpgradeController.py:1805
2199 msgid "Fetching"
2200 msgstr ""
2201
2202-#: ../DistUpgrade/DistUpgradeController.py:1790
2203-#: ../DistUpgrade/DistUpgradeController.py:1844
2204+#: ../DistUpgrade/DistUpgradeController.py:1755
2205+#: ../DistUpgrade/DistUpgradeController.py:1809
2206 msgid "Upgrading"
2207 msgstr ""
2208
2209 #. don't abort here, because it would restore the sources.list
2210-#: ../DistUpgrade/DistUpgradeController.py:1795
2211-#: ../DistUpgrade/DistUpgradeController.py:1846
2212-#: ../DistUpgrade/DistUpgradeController.py:1853
2213-#: ../DistUpgrade/DistUpgradeController.py:1864
2214+#: ../DistUpgrade/DistUpgradeController.py:1760
2215+#: ../DistUpgrade/DistUpgradeController.py:1811
2216+#: ../DistUpgrade/DistUpgradeController.py:1818
2217+#: ../DistUpgrade/DistUpgradeController.py:1829
2218 msgid "Upgrade complete"
2219 msgstr ""
2220
2221-#: ../DistUpgrade/DistUpgradeController.py:1796
2222-#: ../DistUpgrade/DistUpgradeController.py:1847
2223-#: ../DistUpgrade/DistUpgradeController.py:1854
2224+#: ../DistUpgrade/DistUpgradeController.py:1761
2225+#: ../DistUpgrade/DistUpgradeController.py:1812
2226+#: ../DistUpgrade/DistUpgradeController.py:1819
2227 msgid ""
2228 "The upgrade has completed but there were errors during the upgrade process."
2229 msgstr ""
2230
2231-#: ../DistUpgrade/DistUpgradeController.py:1803
2232+#: ../DistUpgrade/DistUpgradeController.py:1768
2233 msgid "Searching for obsolete software"
2234 msgstr ""
2235
2236-#: ../DistUpgrade/DistUpgradeController.py:1816
2237+#: ../DistUpgrade/DistUpgradeController.py:1781
2238 msgid "System upgrade is complete."
2239 msgstr ""
2240
2241-#: ../DistUpgrade/DistUpgradeController.py:1865
2242+#: ../DistUpgrade/DistUpgradeController.py:1830
2243 msgid "The partial upgrade was completed."
2244 msgstr ""
2245
2246 #: ../DistUpgrade/DistUpgradeFetcher.py:123
2247-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:117
2248+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:119
2249 msgid "Could not find the release notes"
2250 msgstr ""
2251
2252 #: ../DistUpgrade/DistUpgradeFetcher.py:124
2253-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:118
2254+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:120
2255 msgid "The server may be overloaded. "
2256 msgstr ""
2257
2258 #: ../DistUpgrade/DistUpgradeFetcher.py:136
2259-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:122
2260+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:124
2261 msgid "Could not download the release notes"
2262 msgstr ""
2263
2264 #: ../DistUpgrade/DistUpgradeFetcher.py:137
2265-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:123
2266+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:125
2267 msgid "Please check your internet connection."
2268 msgstr ""
2269
2270@@ -700,111 +698,111 @@
2271 msgid "authenticate '%(file)s' against '%(signature)s' "
2272 msgstr ""
2273
2274-#: ../DistUpgrade/DistUpgradeFetcherCore.py:139
2275+#: ../DistUpgrade/DistUpgradeFetcherCore.py:136
2276 #, python-format
2277 msgid "extracting '%s'"
2278 msgstr ""
2279
2280-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
2281-#: ../DistUpgrade/DistUpgradeFetcherCore.py:161
2282+#: ../DistUpgrade/DistUpgradeFetcherCore.py:157
2283+#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
2284 msgid "Could not run the upgrade tool"
2285 msgstr ""
2286
2287-#: ../DistUpgrade/DistUpgradeFetcherCore.py:162
2288+#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
2289 msgid ""
2290 "This is most likely a bug in the upgrade tool. Please report it as a bug "
2291 "using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
2292 msgstr ""
2293
2294-#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
2295+#: ../DistUpgrade/DistUpgradeFetcherCore.py:236
2296 msgid "Upgrade tool signature"
2297 msgstr ""
2298
2299-#: ../DistUpgrade/DistUpgradeFetcherCore.py:246
2300+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
2301 msgid "Upgrade tool"
2302 msgstr ""
2303
2304-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
2305+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
2306 msgid "Failed to fetch"
2307 msgstr ""
2308
2309-#: ../DistUpgrade/DistUpgradeFetcherCore.py:281
2310+#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
2311 msgid "Fetching the upgrade failed. There may be a network problem. "
2312 msgstr ""
2313
2314-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
2315+#: ../DistUpgrade/DistUpgradeFetcherCore.py:282
2316 msgid "Authentication failed"
2317 msgstr ""
2318
2319-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
2320+#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
2321 msgid ""
2322 "Authenticating the upgrade failed. There may be a problem with the network "
2323 "or with the server. "
2324 msgstr ""
2325
2326-#: ../DistUpgrade/DistUpgradeFetcherCore.py:291
2327+#: ../DistUpgrade/DistUpgradeFetcherCore.py:288
2328 msgid "Failed to extract"
2329 msgstr ""
2330
2331-#: ../DistUpgrade/DistUpgradeFetcherCore.py:292
2332+#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
2333 msgid ""
2334 "Extracting the upgrade failed. There may be a problem with the network or "
2335 "with the server. "
2336 msgstr ""
2337
2338-#: ../DistUpgrade/DistUpgradeFetcherCore.py:297
2339+#: ../DistUpgrade/DistUpgradeFetcherCore.py:294
2340 msgid "Verification failed"
2341 msgstr ""
2342
2343-#: ../DistUpgrade/DistUpgradeFetcherCore.py:298
2344+#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
2345 msgid ""
2346 "Verifying the upgrade failed. There may be a problem with the network or "
2347 "with the server. "
2348 msgstr ""
2349
2350-#: ../DistUpgrade/DistUpgradeFetcherCore.py:312
2351-#: ../DistUpgrade/DistUpgradeFetcherCore.py:318
2352+#: ../DistUpgrade/DistUpgradeFetcherCore.py:309
2353+#: ../DistUpgrade/DistUpgradeFetcherCore.py:315
2354 msgid "Can not run the upgrade"
2355 msgstr ""
2356
2357-#: ../DistUpgrade/DistUpgradeFetcherCore.py:313
2358+#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
2359 msgid ""
2360 "This usually is caused by a system where /tmp is mounted noexec. Please "
2361 "remount without noexec and run the upgrade again."
2362 msgstr ""
2363
2364-#: ../DistUpgrade/DistUpgradeFetcherCore.py:319
2365+#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
2366 #, python-format
2367 msgid "The error message is '%s'."
2368 msgstr ""
2369
2370-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:68
2371-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:99
2372+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:70
2373+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:101
2374 msgid "Upgrade"
2375 msgstr ""
2376
2377-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:103
2378+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:105
2379 #: ../data/gtkbuilder/ReleaseNotes.ui.h:1
2380 msgid "Release Notes"
2381 msgstr ""
2382
2383-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:145
2384-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:158
2385+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:147
2386+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:160
2387 msgid "Downloading additional package files..."
2388 msgstr ""
2389
2390-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:160
2391+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:162
2392 #, python-format
2393 msgid "File %s of %s at %sB/s"
2394 msgstr ""
2395
2396-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:164
2397+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:166
2398 #, python-format
2399 msgid "File %s of %s"
2400 msgstr ""
2401
2402 #. print("mediaChange %s %s" % (medium, drive))
2403-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:171
2404+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:173
2405 #: ../DistUpgrade/DistUpgradeViewGtk.py:114
2406 #: ../DistUpgrade/DistUpgradeViewGtk3.py:115
2407 #: ../DistUpgrade/DistUpgradeViewKDE.py:196
2408@@ -814,8 +812,8 @@
2409
2410 #. change = QMessageBox.question(None, _("Media Change"), msg,
2411 #. QMessageBox.Ok, QMessageBox.Cancel)
2412-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:174
2413-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:175
2414+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:176
2415+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:177
2416 #: ../DistUpgrade/DistUpgradeViewKDE.py:197
2417 msgid "Media Change"
2418 msgstr ""
2419@@ -835,7 +833,7 @@
2420 msgid "Your graphics hardware may not be fully supported in Ubuntu 13.04."
2421 msgstr ""
2422
2423-#: ../DistUpgrade/DistUpgradeQuirks.py:250
2424+#: ../DistUpgrade/DistUpgradeQuirks.py:248
2425 msgid ""
2426 "Running the 'unity' desktop environment is not fully supported by your "
2427 "graphics hardware. You will maybe end up in a very slow environment after "
2428@@ -845,20 +843,20 @@
2429 "want to continue with the upgrade?"
2430 msgstr ""
2431
2432+#: ../DistUpgrade/DistUpgradeQuirks.py:272
2433+msgid ""
2434+"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
2435+msgstr ""
2436+
2437 #: ../DistUpgrade/DistUpgradeQuirks.py:274
2438 msgid ""
2439-"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
2440-msgstr ""
2441-
2442-#: ../DistUpgrade/DistUpgradeQuirks.py:276
2443-msgid ""
2444 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
2445 "and you may encounter problems after the upgrade. For more information see "
2446 "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Do you want to "
2447 "continue with the upgrade?"
2448 msgstr ""
2449
2450-#: ../DistUpgrade/DistUpgradeQuirks.py:296
2451+#: ../DistUpgrade/DistUpgradeQuirks.py:294
2452 msgid ""
2453 "Upgrading may reduce desktop effects, and performance in games and other "
2454 "graphically intensive programs."
2455@@ -874,7 +872,7 @@
2456 "Do you want to continue?"
2457 msgstr ""
2458
2459-#: ../DistUpgrade/DistUpgradeQuirks.py:300
2460+#: ../DistUpgrade/DistUpgradeQuirks.py:298
2461 msgid ""
2462 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
2463 "of this driver is available that works with your hardware in Ubuntu 10.04 "
2464@@ -883,11 +881,11 @@
2465 "Do you want to continue?"
2466 msgstr ""
2467
2468-#: ../DistUpgrade/DistUpgradeQuirks.py:335
2469+#: ../DistUpgrade/DistUpgradeQuirks.py:333
2470 msgid "No i686 CPU"
2471 msgstr ""
2472
2473-#: ../DistUpgrade/DistUpgradeQuirks.py:336
2474+#: ../DistUpgrade/DistUpgradeQuirks.py:334
2475 msgid ""
2476 "Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
2477 "extension. All packages were built with optimizations requiring i686 as the "
2478@@ -895,11 +893,11 @@
2479 "Ubuntu release with this hardware."
2480 msgstr ""
2481
2482-#: ../DistUpgrade/DistUpgradeQuirks.py:372
2483+#: ../DistUpgrade/DistUpgradeQuirks.py:370
2484 msgid "No ARMv6 CPU"
2485 msgstr ""
2486
2487-#: ../DistUpgrade/DistUpgradeQuirks.py:373
2488+#: ../DistUpgrade/DistUpgradeQuirks.py:371
2489 msgid ""
2490 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
2491 "packages in karmic were built with optimizations requiring ARMv6 as the "
2492@@ -907,11 +905,11 @@
2493 "Ubuntu release with this hardware."
2494 msgstr ""
2495
2496-#: ../DistUpgrade/DistUpgradeQuirks.py:393
2497+#: ../DistUpgrade/DistUpgradeQuirks.py:391
2498 msgid "No init available"
2499 msgstr ""
2500
2501-#: ../DistUpgrade/DistUpgradeQuirks.py:394
2502+#: ../DistUpgrade/DistUpgradeQuirks.py:392
2503 msgid ""
2504 "Your system appears to be a virtualised environment without an init daemon, "
2505 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
2506@@ -1632,41 +1630,41 @@
2507 "via the exit code"
2508 msgstr ""
2509
2510-#: ../do-release-upgrade:113
2511+#: ../do-release-upgrade:108
2512 msgid "Checking for a new Ubuntu release"
2513 msgstr ""
2514
2515-#: ../do-release-upgrade:125
2516+#: ../do-release-upgrade:121
2517 msgid "Your Ubuntu release is not supported anymore."
2518 msgstr ""
2519
2520-#: ../do-release-upgrade:126
2521+#: ../do-release-upgrade:122
2522 msgid ""
2523 "For upgrade information, please visit:\n"
2524 "%(url)s\n"
2525 msgstr ""
2526
2527-#: ../do-release-upgrade:132
2528+#: ../do-release-upgrade:128
2529 msgid "No new release found"
2530 msgstr ""
2531
2532-#: ../do-release-upgrade:137
2533+#: ../do-release-upgrade:133
2534 msgid "Release upgrade not possible right now"
2535 msgstr ""
2536
2537-#: ../do-release-upgrade:138
2538+#: ../do-release-upgrade:134
2539 #, c-format
2540 msgid ""
2541 "The release upgrade can not be performed currently, please try again later. "
2542 "The server reported: '%s'"
2543 msgstr ""
2544
2545-#: ../do-release-upgrade:144
2546+#: ../do-release-upgrade:140
2547 #, c-format
2548 msgid "New release '%s' available."
2549 msgstr ""
2550
2551-#: ../do-release-upgrade:145
2552+#: ../do-release-upgrade:141
2553 msgid "Run 'do-release-upgrade' to upgrade to it."
2554 msgstr ""
2555
2556
2557=== modified file 'po/ar.po'
2558--- po/ar.po 2014-04-07 14:07:10 +0000
2559+++ po/ar.po 2021-05-11 08:09:06 +0000
2560@@ -18,12 +18,12 @@
2561 "Content-Transfer-Encoding: 8bit\n"
2562 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
2563 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
2564-"X-Launchpad-Export-Date: 2014-04-05 06:07+0000\n"
2565-"X-Generator: Launchpad (build 16976)\n"
2566+"X-Launchpad-Export-Date: 2014-04-23 06:50+0000\n"
2567+"X-Generator: Launchpad (build 16985)\n"
2568 "Language: \n"
2569
2570 #. TRANSLATORS: %s is a country
2571-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
2572+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:441
2573 #, python-format
2574 msgid "Server for %s"
2575 msgstr "خادوم %s"
2576@@ -193,12 +193,12 @@
2577 msgid "Trying to install blacklisted version '%s'"
2578 msgstr "يحاول تثبيت نسخة في القائمة السوداء '%s'"
2579
2580+#: ../DistUpgrade/DistUpgradeCache.py:859
2581+#, python-format
2582+msgid "Can't install '%s'"
2583+msgstr "تعذّر تثبيت '%s'"
2584+
2585 #: ../DistUpgrade/DistUpgradeCache.py:860
2586-#, python-format
2587-msgid "Can't install '%s'"
2588-msgstr "تعذّر تثبيت '%s'"
2589-
2590-#: ../DistUpgrade/DistUpgradeCache.py:861
2591 msgid ""
2592 "It was impossible to install a required package. Please report this as a bug "
2593 "using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
2594@@ -206,7 +206,8 @@
2595 "كان من المستحيل تثبيت حزمة مطلوبة. رجاءً أبلغ عن هذه العلة باستخدام الأمر "
2596 "'ubuntu-bug ubuntu-release-upgrader-core' في طرفية."
2597
2598-#: ../DistUpgrade/DistUpgradeCache.py:872
2599+#. FIXME: provide a list
2600+#: ../DistUpgrade/DistUpgradeCache.py:871
2601 msgid "Can't guess meta-package"
2602 msgstr "تعذّرت معرفة الحزمة الفوقية"
2603
2604@@ -437,12 +438,11 @@
2605 "\n"
2606 "هل تود إضافة المدخلات الافتراضية لـ'%s'؟ إن أجبت ﺑ'ﻻ' فستُلغى عملية الترقية."
2607
2608-#: ../DistUpgrade/DistUpgradeController.py:820
2609-#: ../DistUpgrade/DistUpgradeController.py:826
2610+#: ../DistUpgrade/DistUpgradeController.py:819
2611 msgid "Repository information invalid"
2612 msgstr "معلومات المستودع غير صحيحة"
2613
2614-#: ../DistUpgrade/DistUpgradeController.py:821
2615+#: ../DistUpgrade/DistUpgradeController.py:820
2616 msgid ""
2617 "Upgrading the repository information resulted in a invalid file so a bug "
2618 "reporting process is being started."
2619@@ -450,11 +450,11 @@
2620 "ترقية معلومات المستودعات أسفرت عن ملف غير صالح، لذلك يجري بدء عملية للإبلاغ "
2621 "عن العلّة."
2622
2623-#: ../DistUpgrade/DistUpgradeController.py:836
2624+#: ../DistUpgrade/DistUpgradeController.py:827
2625 msgid "Third party sources disabled"
2626 msgstr "مصادر الأطراف الخارجية عُطّلت"
2627
2628-#: ../DistUpgrade/DistUpgradeController.py:837
2629+#: ../DistUpgrade/DistUpgradeController.py:828
2630 msgid ""
2631 "Some third party entries in your sources.list were disabled. You can re-"
2632 "enable them after the upgrade with the 'software-properties' tool or your "
2633@@ -463,7 +463,7 @@
2634 "بعض مدخلات الأطراف الخارجية في sources.list قد عطلت. يمكنك إعادة تفعيلها بعد "
2635 "الترقية، باستخدام أداة 'software-properties' في مدير الحزم."
2636
2637-#: ../DistUpgrade/DistUpgradeController.py:879
2638+#: ../DistUpgrade/DistUpgradeController.py:870
2639 msgid "Package in inconsistent state"
2640 msgid_plural "Packages in inconsistent state"
2641 msgstr[0] "لا حزم في حالة غير متسقة"
2642@@ -473,7 +473,7 @@
2643 msgstr[4] "حزم في حالة غير متسقة"
2644 msgstr[5] "حزم في حالة غير متسقة"
2645
2646-#: ../DistUpgrade/DistUpgradeController.py:882
2647+#: ../DistUpgrade/DistUpgradeController.py:873
2648 #, python-format
2649 msgid ""
2650 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
2651@@ -502,11 +502,11 @@
2652 "حالة الحزم '%s' متضاربة وتحتاج أن يعاد تثبيتها، لكن لا أرشيف وجد لها. من "
2653 "فضلك أعد تثبيت الحزم يدويا أو أزلها من النظام."
2654
2655-#: ../DistUpgrade/DistUpgradeController.py:930
2656+#: ../DistUpgrade/DistUpgradeController.py:921
2657 msgid "Error during update"
2658 msgstr "عطل أثناء التحديث"
2659
2660-#: ../DistUpgrade/DistUpgradeController.py:931
2661+#: ../DistUpgrade/DistUpgradeController.py:922
2662 msgid ""
2663 "A problem occurred during the update. This is usually some sort of network "
2664 "problem, please check your network connection and retry."
2665@@ -514,11 +514,11 @@
2666 "طرأت مشكلة أثناء التحديث. عادة ما يكون هذا نتيجة مشكلة ما في الشبكة، تحقق من "
2667 "اتصالك الشبكي وحاول مجددا."
2668
2669-#: ../DistUpgrade/DistUpgradeController.py:940
2670+#: ../DistUpgrade/DistUpgradeController.py:931
2671 msgid "Not enough free disk space"
2672 msgstr "لا توجد مساحة كافية على القرص"
2673
2674-#: ../DistUpgrade/DistUpgradeController.py:941
2675+#: ../DistUpgrade/DistUpgradeController.py:932
2676 #, python-format
2677 msgid ""
2678 "The upgrade has aborted. The upgrade needs a total of %s free space on disk "
2679@@ -532,21 +532,21 @@
2680
2681 #. calc the dist-upgrade and see if the removals are ok/expected
2682 #. do the dist-upgrade
2683-#: ../DistUpgrade/DistUpgradeController.py:970
2684-#: ../DistUpgrade/DistUpgradeController.py:1778
2685+#: ../DistUpgrade/DistUpgradeController.py:961
2686+#: ../DistUpgrade/DistUpgradeController.py:1743
2687 msgid "Calculating the changes"
2688 msgstr "يُحصي التغيرات"
2689
2690 #. ask the user
2691-#: ../DistUpgrade/DistUpgradeController.py:1002
2692+#: ../DistUpgrade/DistUpgradeController.py:993
2693 msgid "Do you want to start the upgrade?"
2694 msgstr "أتريد بدء التحديث الآن؟"
2695
2696-#: ../DistUpgrade/DistUpgradeController.py:1075
2697+#: ../DistUpgrade/DistUpgradeController.py:1066
2698 msgid "Upgrade canceled"
2699 msgstr "أُلغيت الترقية"
2700
2701-#: ../DistUpgrade/DistUpgradeController.py:1076
2702+#: ../DistUpgrade/DistUpgradeController.py:1067
2703 msgid ""
2704 "The upgrade will cancel now and the original system state will be restored. "
2705 "You can resume the upgrade at a later time."
2706@@ -554,12 +554,12 @@
2707 "الترقية ستلغى وسيتم استعادة الحالة الأصلية للنظام. بإمكانك استئناف الترقية "
2708 "في وقت لاحق."
2709
2710-#: ../DistUpgrade/DistUpgradeController.py:1082
2711-#: ../DistUpgrade/DistUpgradeController.py:1206
2712+#: ../DistUpgrade/DistUpgradeController.py:1073
2713+#: ../DistUpgrade/DistUpgradeController.py:1197
2714 msgid "Could not download the upgrades"
2715 msgstr "تعذّر تنزيل الترقيات"
2716
2717-#: ../DistUpgrade/DistUpgradeController.py:1083
2718+#: ../DistUpgrade/DistUpgradeController.py:1074
2719 msgid ""
2720 "The upgrade has aborted. Please check your Internet connection or "
2721 "installation media and try again. All files downloaded so far have been kept."
2722@@ -569,27 +569,27 @@
2723
2724 #. FIXME: strings are not good, but we are in string freeze
2725 #. currently
2726-#: ../DistUpgrade/DistUpgradeController.py:1157
2727-#: ../DistUpgrade/DistUpgradeController.py:1194
2728-#: ../DistUpgrade/DistUpgradeController.py:1299
2729+#: ../DistUpgrade/DistUpgradeController.py:1148
2730+#: ../DistUpgrade/DistUpgradeController.py:1185
2731+#: ../DistUpgrade/DistUpgradeController.py:1290
2732 msgid "Error during commit"
2733 msgstr "عطل أثناء الإيداع"
2734
2735 #. generate a new cache
2736-#: ../DistUpgrade/DistUpgradeController.py:1159
2737-#: ../DistUpgrade/DistUpgradeController.py:1196
2738-#: ../DistUpgrade/DistUpgradeController.py:1338
2739+#: ../DistUpgrade/DistUpgradeController.py:1150
2740+#: ../DistUpgrade/DistUpgradeController.py:1187
2741+#: ../DistUpgrade/DistUpgradeController.py:1329
2742 msgid "Restoring original system state"
2743 msgstr "يسترجع الحالة الأصلية للنظام"
2744
2745-#: ../DistUpgrade/DistUpgradeController.py:1160
2746-#: ../DistUpgrade/DistUpgradeController.py:1175
2747-#: ../DistUpgrade/DistUpgradeController.py:1197
2748+#: ../DistUpgrade/DistUpgradeController.py:1151
2749+#: ../DistUpgrade/DistUpgradeController.py:1166
2750+#: ../DistUpgrade/DistUpgradeController.py:1188
2751 msgid "Could not install the upgrades"
2752 msgstr "تعذّر تثبيت الترقيات"
2753
2754 #. invoke the frontend now and show a error message
2755-#: ../DistUpgrade/DistUpgradeController.py:1165
2756+#: ../DistUpgrade/DistUpgradeController.py:1156
2757 msgid ""
2758 "The upgrade has aborted. Your system could be in an unusable state. A "
2759 "recovery will run now (dpkg --configure -a)."
2760@@ -597,7 +597,7 @@
2761 "لقد أُجهضت الترقية. قد يصبح نظامك في خالة غير مستقرة. سيُشغل الاستعفاء الآن "
2762 "(dpkg --configure -a)."
2763
2764-#: ../DistUpgrade/DistUpgradeController.py:1170
2765+#: ../DistUpgrade/DistUpgradeController.py:1161
2766 #, python-format
2767 msgid ""
2768 "\n"
2769@@ -614,27 +614,27 @@
2770 "وأرفق الملفات الموجودة في /var/log/dist-upgrade/ في تقرير العلة.\n"
2771 "%s"
2772
2773-#: ../DistUpgrade/DistUpgradeController.py:1207
2774+#: ../DistUpgrade/DistUpgradeController.py:1198
2775 msgid ""
2776 "The upgrade has aborted. Please check your Internet connection or "
2777 "installation media and try again. "
2778 msgstr ""
2779 "لقد تم إلغاء الترقية. تحقق من اتصالك بالإنترنت أو وسيط التثبيت وحاول مجددا. "
2780
2781-#: ../DistUpgrade/DistUpgradeController.py:1287
2782+#: ../DistUpgrade/DistUpgradeController.py:1278
2783 msgid "Remove obsolete packages?"
2784 msgstr "أأزيل الحزم المبطلة؟"
2785
2786-#: ../DistUpgrade/DistUpgradeController.py:1288
2787+#: ../DistUpgrade/DistUpgradeController.py:1279
2788 #: ../data/gtkbuilder/DistUpgrade.ui.h:8
2789 msgid "_Keep"
2790 msgstr "ا_ستبق"
2791
2792-#: ../DistUpgrade/DistUpgradeController.py:1288
2793+#: ../DistUpgrade/DistUpgradeController.py:1279
2794 msgid "_Remove"
2795 msgstr "أ_زل"
2796
2797-#: ../DistUpgrade/DistUpgradeController.py:1300
2798+#: ../DistUpgrade/DistUpgradeController.py:1291
2799 msgid ""
2800 "A problem occurred during the clean-up. Please see the below message for "
2801 "more information. "
2802@@ -642,39 +642,37 @@
2803
2804 #. FIXME: instead of error out, fetch and install it
2805 #. here
2806-#: ../DistUpgrade/DistUpgradeController.py:1376
2807+#: ../DistUpgrade/DistUpgradeController.py:1367
2808 msgid "Required depends is not installed"
2809 msgstr "اعتمادات مطلوبة غير مثبتة"
2810
2811-#: ../DistUpgrade/DistUpgradeController.py:1377
2812+#: ../DistUpgrade/DistUpgradeController.py:1368
2813 #, python-format
2814 msgid "The required dependency '%s' is not installed. "
2815 msgstr "الاعتمادية المطلوبة '%s' ليست مثبتة. "
2816
2817 #. sanity check (check for ubuntu-desktop, brokenCache etc)
2818 #. then open the cache (again)
2819-#: ../DistUpgrade/DistUpgradeController.py:1645
2820-#: ../DistUpgrade/DistUpgradeController.py:1732
2821+#: ../DistUpgrade/DistUpgradeController.py:1636
2822+#: ../DistUpgrade/DistUpgradeController.py:1701
2823 msgid "Checking package manager"
2824 msgstr "يفحص مدير الحزم"
2825
2826-#: ../DistUpgrade/DistUpgradeController.py:1651
2827-#: ../DistUpgrade/DistUpgradeController.py:1657
2828+#: ../DistUpgrade/DistUpgradeController.py:1641
2829 msgid "Preparing the upgrade failed"
2830 msgstr "فشل تجهيز الترقية"
2831
2832-#: ../DistUpgrade/DistUpgradeController.py:1652
2833+#: ../DistUpgrade/DistUpgradeController.py:1642
2834 msgid ""
2835 "Preparing the system for the upgrade failed so a bug reporting process is "
2836 "being started."
2837 msgstr "فشل تحضير النظام للترقية، لذلك يجري بدء عملية للإبلاغ عن العلّة."
2838
2839-#: ../DistUpgrade/DistUpgradeController.py:1675
2840-#: ../DistUpgrade/DistUpgradeController.py:1685
2841+#: ../DistUpgrade/DistUpgradeController.py:1656
2842 msgid "Getting upgrade prerequisites failed"
2843 msgstr "فشل جلب متطلبات الترقية"
2844
2845-#: ../DistUpgrade/DistUpgradeController.py:1676
2846+#: ../DistUpgrade/DistUpgradeController.py:1657
2847 msgid ""
2848 "The system was unable to get the prerequisites for the upgrade. The upgrade "
2849 "will abort now and restore the original system state.\n"
2850@@ -686,23 +684,23 @@
2851 "\n"
2852 "بالإضافة إلى ذلك، يجرى بدء عملية للإبلاغ عن العلّة."
2853
2854-#: ../DistUpgrade/DistUpgradeController.py:1716
2855+#: ../DistUpgrade/DistUpgradeController.py:1685
2856 msgid "Updating repository information"
2857 msgstr "يحدّث معلومات المستودعات"
2858
2859-#: ../DistUpgrade/DistUpgradeController.py:1723
2860+#: ../DistUpgrade/DistUpgradeController.py:1692
2861 msgid "Failed to add the cdrom"
2862 msgstr "فشل في إضافة القرص المدمج"
2863
2864-#: ../DistUpgrade/DistUpgradeController.py:1724
2865+#: ../DistUpgrade/DistUpgradeController.py:1693
2866 msgid "Sorry, adding the cdrom was not successful."
2867 msgstr "عفواً، لم يتم إضافة القرص المدمج بنجاح."
2868
2869-#: ../DistUpgrade/DistUpgradeController.py:1755
2870+#: ../DistUpgrade/DistUpgradeController.py:1724
2871 msgid "Invalid package information"
2872 msgstr "معلومات حزم غير صحيحة"
2873
2874-#: ../DistUpgrade/DistUpgradeController.py:1756
2875+#: ../DistUpgrade/DistUpgradeController.py:1725
2876 #, python-format
2877 msgid ""
2878 "After updating your package information, the essential package '%s' could "
2879@@ -721,60 +719,60 @@
2880 "إذا كانت المشكلة بسبب الحِمل الزائد على الروابط البديلة، فربما عليك محاولة "
2881 "الترقية لاحقا."
2882
2883-#: ../DistUpgrade/DistUpgradeController.py:1784
2884-#: ../DistUpgrade/DistUpgradeController.py:1840
2885+#: ../DistUpgrade/DistUpgradeController.py:1749
2886+#: ../DistUpgrade/DistUpgradeController.py:1805
2887 msgid "Fetching"
2888 msgstr "يجلب"
2889
2890-#: ../DistUpgrade/DistUpgradeController.py:1790
2891-#: ../DistUpgrade/DistUpgradeController.py:1844
2892+#: ../DistUpgrade/DistUpgradeController.py:1755
2893+#: ../DistUpgrade/DistUpgradeController.py:1809
2894 msgid "Upgrading"
2895 msgstr "تجري الترقية"
2896
2897 #. don't abort here, because it would restore the sources.list
2898-#: ../DistUpgrade/DistUpgradeController.py:1795
2899-#: ../DistUpgrade/DistUpgradeController.py:1846
2900-#: ../DistUpgrade/DistUpgradeController.py:1853
2901-#: ../DistUpgrade/DistUpgradeController.py:1864
2902+#: ../DistUpgrade/DistUpgradeController.py:1760
2903+#: ../DistUpgrade/DistUpgradeController.py:1811
2904+#: ../DistUpgrade/DistUpgradeController.py:1818
2905+#: ../DistUpgrade/DistUpgradeController.py:1829
2906 msgid "Upgrade complete"
2907 msgstr "اكتملت الترقية"
2908
2909-#: ../DistUpgrade/DistUpgradeController.py:1796
2910-#: ../DistUpgrade/DistUpgradeController.py:1847
2911-#: ../DistUpgrade/DistUpgradeController.py:1854
2912+#: ../DistUpgrade/DistUpgradeController.py:1761
2913+#: ../DistUpgrade/DistUpgradeController.py:1812
2914+#: ../DistUpgrade/DistUpgradeController.py:1819
2915 msgid ""
2916 "The upgrade has completed but there were errors during the upgrade process."
2917 msgstr "الترقية اكتملت، ولكن كان هناك أخطاء أثناء عملية الترقية."
2918
2919-#: ../DistUpgrade/DistUpgradeController.py:1803
2920+#: ../DistUpgrade/DistUpgradeController.py:1768
2921 msgid "Searching for obsolete software"
2922 msgstr "يبحث عن برمجيات قديمة"
2923
2924-#: ../DistUpgrade/DistUpgradeController.py:1816
2925+#: ../DistUpgrade/DistUpgradeController.py:1781
2926 msgid "System upgrade is complete."
2927 msgstr "تمت ترقية النظام."
2928
2929-#: ../DistUpgrade/DistUpgradeController.py:1865
2930+#: ../DistUpgrade/DistUpgradeController.py:1830
2931 msgid "The partial upgrade was completed."
2932 msgstr "اكتملت الترقية الجزئية."
2933
2934 #: ../DistUpgrade/DistUpgradeFetcher.py:123
2935-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:117
2936+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:119
2937 msgid "Could not find the release notes"
2938 msgstr "تعذّر العثور على ملاحظات الإصدارة"
2939
2940 #: ../DistUpgrade/DistUpgradeFetcher.py:124
2941-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:118
2942+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:120
2943 msgid "The server may be overloaded. "
2944 msgstr "قد يكون الخادوم محملا فوق طاقته. "
2945
2946 #: ../DistUpgrade/DistUpgradeFetcher.py:136
2947-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:122
2948+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:124
2949 msgid "Could not download the release notes"
2950 msgstr "تعذّر تنزيل ملاحظات الإصدارة"
2951
2952 #: ../DistUpgrade/DistUpgradeFetcher.py:137
2953-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:123
2954+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:125
2955 msgid "Please check your internet connection."
2956 msgstr "رجاءً تحقق من اتصالك بالإنترنت."
2957
2958@@ -783,17 +781,17 @@
2959 msgid "authenticate '%(file)s' against '%(signature)s' "
2960 msgstr "توثيق '%(file)s' باستخدام البصمة '%(signature)s' "
2961
2962-#: ../DistUpgrade/DistUpgradeFetcherCore.py:139
2963+#: ../DistUpgrade/DistUpgradeFetcherCore.py:136
2964 #, python-format
2965 msgid "extracting '%s'"
2966 msgstr "يستخرج '%s'"
2967
2968-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
2969-#: ../DistUpgrade/DistUpgradeFetcherCore.py:161
2970+#: ../DistUpgrade/DistUpgradeFetcherCore.py:157
2971+#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
2972 msgid "Could not run the upgrade tool"
2973 msgstr "تعذّر تشغيل أداة الترقية"
2974
2975-#: ../DistUpgrade/DistUpgradeFetcherCore.py:162
2976+#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
2977 msgid ""
2978 "This is most likely a bug in the upgrade tool. Please report it as a bug "
2979 "using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
2980@@ -801,58 +799,58 @@
2981 "على الأرجح، هذا خطأ في أداة الترقية. رجاءً أبلغ عن هذه العلة باستخدام الأمر "
2982 "'ubuntu-bug ubuntu-release-upgrader-core'."
2983
2984-#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
2985+#: ../DistUpgrade/DistUpgradeFetcherCore.py:236
2986 msgid "Upgrade tool signature"
2987 msgstr "توقيع أداة الترقية"
2988
2989-#: ../DistUpgrade/DistUpgradeFetcherCore.py:246
2990+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
2991 msgid "Upgrade tool"
2992 msgstr "أداة الترقية"
2993
2994-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
2995+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
2996 msgid "Failed to fetch"
2997 msgstr "فشل الجلب"
2998
2999-#: ../DistUpgrade/DistUpgradeFetcherCore.py:281
3000+#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
3001 msgid "Fetching the upgrade failed. There may be a network problem. "
3002 msgstr "فشل جلب الترقية، قد تكون هناك مشكلة في الشبكة. "
3003
3004-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
3005+#: ../DistUpgrade/DistUpgradeFetcherCore.py:282
3006 msgid "Authentication failed"
3007 msgstr "فشل الاستيثاق"
3008
3009-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
3010+#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
3011 msgid ""
3012 "Authenticating the upgrade failed. There may be a problem with the network "
3013 "or with the server. "
3014 msgstr "فشل استيثاق الترقية. قد توجد مشكلة في الشبكة أو في الخادوم. "
3015
3016-#: ../DistUpgrade/DistUpgradeFetcherCore.py:291
3017+#: ../DistUpgrade/DistUpgradeFetcherCore.py:288
3018 msgid "Failed to extract"
3019 msgstr "فشل الاستخراج"
3020
3021-#: ../DistUpgrade/DistUpgradeFetcherCore.py:292
3022+#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
3023 msgid ""
3024 "Extracting the upgrade failed. There may be a problem with the network or "
3025 "with the server. "
3026 msgstr "فشل استخلاص الترقية، قد تكون هناك مشكلة في الشبكة أو الخادوم. "
3027
3028-#: ../DistUpgrade/DistUpgradeFetcherCore.py:297
3029+#: ../DistUpgrade/DistUpgradeFetcherCore.py:294
3030 msgid "Verification failed"
3031 msgstr "فشل التحقق"
3032
3033-#: ../DistUpgrade/DistUpgradeFetcherCore.py:298
3034+#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
3035 msgid ""
3036 "Verifying the upgrade failed. There may be a problem with the network or "
3037 "with the server. "
3038 msgstr "فشل التحقق من الترقية. قد توجد مشكلة في الشبكة أو في الخادوم. "
3039
3040-#: ../DistUpgrade/DistUpgradeFetcherCore.py:312
3041-#: ../DistUpgrade/DistUpgradeFetcherCore.py:318
3042+#: ../DistUpgrade/DistUpgradeFetcherCore.py:309
3043+#: ../DistUpgrade/DistUpgradeFetcherCore.py:315
3044 msgid "Can not run the upgrade"
3045 msgstr "لا يمكن اجراء الترقية"
3046
3047-#: ../DistUpgrade/DistUpgradeFetcherCore.py:313
3048+#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
3049 msgid ""
3050 "This usually is caused by a system where /tmp is mounted noexec. Please "
3051 "remount without noexec and run the upgrade again."
3052@@ -860,38 +858,38 @@
3053 "غالبًا ما يحدث هذا إذا ما تم تحميل /tmp بإشارة nonexec. رجاءً أعد التحميل "
3054 "بدون nonexec ثم أعد تشغيل الترقية."
3055
3056-#: ../DistUpgrade/DistUpgradeFetcherCore.py:319
3057+#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
3058 #, python-format
3059 msgid "The error message is '%s'."
3060 msgstr "رسالة الخطأ هي '%s'."
3061
3062-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:68
3063-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:99
3064+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:70
3065+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:101
3066 msgid "Upgrade"
3067 msgstr "رقّ"
3068
3069-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:103
3070+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:105
3071 #: ../data/gtkbuilder/ReleaseNotes.ui.h:1
3072 msgid "Release Notes"
3073 msgstr "ملاحظات الإصدار"
3074
3075-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:145
3076-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:158
3077+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:147
3078+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:160
3079 msgid "Downloading additional package files..."
3080 msgstr "تنزيل ملفات الحزم الإضافية..."
3081
3082-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:160
3083+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:162
3084 #, python-format
3085 msgid "File %s of %s at %sB/s"
3086 msgstr "الملف %s من %s بسرعة %s ب/ث"
3087
3088-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:164
3089+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:166
3090 #, python-format
3091 msgid "File %s of %s"
3092 msgstr "ملف %s من %s"
3093
3094 #. print("mediaChange %s %s" % (medium, drive))
3095-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:171
3096+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:173
3097 #: ../DistUpgrade/DistUpgradeViewGtk.py:114
3098 #: ../DistUpgrade/DistUpgradeViewGtk3.py:115
3099 #: ../DistUpgrade/DistUpgradeViewKDE.py:196
3100@@ -901,8 +899,8 @@
3101
3102 #. change = QMessageBox.question(None, _("Media Change"), msg,
3103 #. QMessageBox.Ok, QMessageBox.Cancel)
3104-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:174
3105-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:175
3106+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:176
3107+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:177
3108 #: ../DistUpgrade/DistUpgradeViewKDE.py:197
3109 msgid "Media Change"
3110 msgstr "تغيير الوسائط"
3111@@ -924,7 +922,7 @@
3112 msgid "Your graphics hardware may not be fully supported in Ubuntu 13.04."
3113 msgstr "قد يكون عتاد الرسوميات في جهازك ليس مدعوما بالكامل في أوبونتو 13.04."
3114
3115-#: ../DistUpgrade/DistUpgradeQuirks.py:250
3116+#: ../DistUpgrade/DistUpgradeQuirks.py:248
3117 msgid ""
3118 "Running the 'unity' desktop environment is not fully supported by your "
3119 "graphics hardware. You will maybe end up in a very slow environment after "
3120@@ -939,12 +937,12 @@
3121 "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForUnity3D\r\n"
3122 "هل ما زلت ترغب بالاستمرار في الترقية؟"
3123
3124-#: ../DistUpgrade/DistUpgradeQuirks.py:274
3125+#: ../DistUpgrade/DistUpgradeQuirks.py:272
3126 msgid ""
3127 "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
3128 msgstr "قد يكون عتاد الرسوميات في جهازك غير مدعوم بالكامل في أوبنتو 12.04."
3129
3130-#: ../DistUpgrade/DistUpgradeQuirks.py:276
3131+#: ../DistUpgrade/DistUpgradeQuirks.py:274
3132 msgid ""
3133 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
3134 "and you may encounter problems after the upgrade. For more information see "
3135@@ -956,7 +954,7 @@
3136 "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx هل تود الاستمرار "
3137 "في الترقية؟"
3138
3139-#: ../DistUpgrade/DistUpgradeQuirks.py:296
3140+#: ../DistUpgrade/DistUpgradeQuirks.py:294
3141 msgid ""
3142 "Upgrading may reduce desktop effects, and performance in games and other "
3143 "graphically intensive programs."
3144@@ -978,7 +976,7 @@
3145 "\n"
3146 "أتريد المواصلة؟"
3147
3148-#: ../DistUpgrade/DistUpgradeQuirks.py:300
3149+#: ../DistUpgrade/DistUpgradeQuirks.py:298
3150 msgid ""
3151 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
3152 "of this driver is available that works with your hardware in Ubuntu 10.04 "
3153@@ -991,11 +989,11 @@
3154 "\n"
3155 "أتريد المواصلة؟"
3156
3157-#: ../DistUpgrade/DistUpgradeQuirks.py:335
3158+#: ../DistUpgrade/DistUpgradeQuirks.py:333
3159 msgid "No i686 CPU"
3160 msgstr "لا يوجد معالج i686"
3161
3162-#: ../DistUpgrade/DistUpgradeQuirks.py:336
3163+#: ../DistUpgrade/DistUpgradeQuirks.py:334
3164 msgid ""
3165 "Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
3166 "extension. All packages were built with optimizations requiring i686 as the "
3167@@ -1006,11 +1004,11 @@
3168 "الحزم متطلبةً لبنية i686 كحد أدنى. ليس من الممكن ترقية نظامك إلى إصدارة "
3169 "أوبونتو الجديدة مع هذا العتاد."
3170
3171-#: ../DistUpgrade/DistUpgradeQuirks.py:372
3172+#: ../DistUpgrade/DistUpgradeQuirks.py:370
3173 msgid "No ARMv6 CPU"
3174 msgstr "لا معالج ARMv6"
3175
3176-#: ../DistUpgrade/DistUpgradeQuirks.py:373
3177+#: ../DistUpgrade/DistUpgradeQuirks.py:371
3178 msgid ""
3179 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
3180 "packages in karmic were built with optimizations requiring ARMv6 as the "
3181@@ -1021,11 +1019,11 @@
3182 "مبنية لتعمل على الطراز ARMv6 كحد أدنى. من غير الممكن ترقية نظامك إلى إصدارة "
3183 "أوبونتو حديثة مع هذا العتاد."
3184
3185-#: ../DistUpgrade/DistUpgradeQuirks.py:393
3186+#: ../DistUpgrade/DistUpgradeQuirks.py:391
3187 msgid "No init available"
3188 msgstr "لا يوجد عفريت مدير للعمليات"
3189
3190-#: ../DistUpgrade/DistUpgradeQuirks.py:394
3191+#: ../DistUpgrade/DistUpgradeQuirks.py:392
3192 msgid ""
3193 "Your system appears to be a virtualised environment without an init daemon, "
3194 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
3195@@ -1836,15 +1834,15 @@
3196 "تحقق فقط إذا كان هناك إصدار جديد من التوزيعة متوفرا و أرسل تقريرا خلال كود "
3197 "الخروج"
3198
3199-#: ../do-release-upgrade:113
3200+#: ../do-release-upgrade:108
3201 msgid "Checking for a new Ubuntu release"
3202 msgstr "يتحقق من وجود إصدارة جديدة من أبونتو"
3203
3204-#: ../do-release-upgrade:125
3205+#: ../do-release-upgrade:121
3206 msgid "Your Ubuntu release is not supported anymore."
3207 msgstr "نسختك من أبونتو لم تعد مدعومة بعد الآن."
3208
3209-#: ../do-release-upgrade:126
3210+#: ../do-release-upgrade:122
3211 msgid ""
3212 "For upgrade information, please visit:\n"
3213 "%(url)s\n"
3214@@ -1852,27 +1850,27 @@
3215 "لمعلومات عن الترقية، رجاءً قم بزيارة:\n"
3216 "%(url)s\n"
3217
3218-#: ../do-release-upgrade:132
3219+#: ../do-release-upgrade:128
3220 msgid "No new release found"
3221 msgstr "لا توجد إصدارات أحدث"
3222
3223-#: ../do-release-upgrade:137
3224+#: ../do-release-upgrade:133
3225 msgid "Release upgrade not possible right now"
3226 msgstr "يتعذّر ترقية الإصدارة حاليا"
3227
3228-#: ../do-release-upgrade:138
3229+#: ../do-release-upgrade:134
3230 #, c-format
3231 msgid ""
3232 "The release upgrade can not be performed currently, please try again later. "
3233 "The server reported: '%s'"
3234 msgstr "تعذّر ترفية الإصدارة حاليا، أعد المحاولة لاحقا. رد الخادوم: '%s'"
3235
3236-#: ../do-release-upgrade:144
3237+#: ../do-release-upgrade:140
3238 #, c-format
3239 msgid "New release '%s' available."
3240 msgstr "لا تتوفر إصدارات '%s'"
3241
3242-#: ../do-release-upgrade:145
3243+#: ../do-release-upgrade:141
3244 msgid "Run 'do-release-upgrade' to upgrade to it."
3245 msgstr "شغّل 'do-release-upgrade' للترقية إليه."
3246
3247
3248=== modified file 'po/ast.po'
3249--- po/ast.po 2014-04-07 14:07:10 +0000
3250+++ po/ast.po 2021-05-11 08:09:06 +0000
3251@@ -15,12 +15,12 @@
3252 "Content-Type: text/plain; charset=UTF-8\n"
3253 "Content-Transfer-Encoding: 8bit\n"
3254 "Plural-Forms: nplurals=2; plural=n != 1;\n"
3255-"X-Launchpad-Export-Date: 2014-04-05 06:07+0000\n"
3256-"X-Generator: Launchpad (build 16976)\n"
3257+"X-Launchpad-Export-Date: 2014-04-23 06:50+0000\n"
3258+"X-Generator: Launchpad (build 16985)\n"
3259 "Language: ast\n"
3260
3261 #. TRANSLATORS: %s is a country
3262-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
3263+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:441
3264 #, python-format
3265 msgid "Server for %s"
3266 msgstr "Sirvidores pa %s"
3267@@ -182,12 +182,12 @@
3268 msgid "Trying to install blacklisted version '%s'"
3269 msgstr "Intentando instalar la versión prohibida «%s»"
3270
3271-#: ../DistUpgrade/DistUpgradeCache.py:860
3272+#: ../DistUpgrade/DistUpgradeCache.py:859
3273 #, python-format
3274 msgid "Can't install '%s'"
3275 msgstr "Nun puede instalase '%s'"
3276
3277-#: ../DistUpgrade/DistUpgradeCache.py:861
3278+#: ../DistUpgrade/DistUpgradeCache.py:860
3279 msgid ""
3280 "It was impossible to install a required package. Please report this as a bug "
3281 "using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
3282@@ -195,7 +195,8 @@
3283 "Nun foi dable instalar un paquete requeríu. Informa d'esto como un fallu "
3284 "usando «ubuntu-bug ubuntu-release-upgrader-core» nuna terminal."
3285
3286-#: ../DistUpgrade/DistUpgradeCache.py:872
3287+#. FIXME: provide a list
3288+#: ../DistUpgrade/DistUpgradeCache.py:871
3289 msgid "Can't guess meta-package"
3290 msgstr "Nun pudo determinase'l meta-paquete"
3291
3292@@ -442,12 +443,11 @@
3293 "Tendríen d'amestase les entraes predeterminaes pa '%s'? Si respuendes 'Non', "
3294 "encaboxaráse l'anovamientu."
3295
3296-#: ../DistUpgrade/DistUpgradeController.py:820
3297-#: ../DistUpgrade/DistUpgradeController.py:826
3298+#: ../DistUpgrade/DistUpgradeController.py:819
3299 msgid "Repository information invalid"
3300 msgstr "Información del repositoriu non válida"
3301
3302-#: ../DistUpgrade/DistUpgradeController.py:821
3303+#: ../DistUpgrade/DistUpgradeController.py:820
3304 msgid ""
3305 "Upgrading the repository information resulted in a invalid file so a bug "
3306 "reporting process is being started."
3307@@ -455,11 +455,11 @@
3308 "L'anovamientu de la información del repositoriu dio como resultáu un ficheru "
3309 "inválidu polo que ta aniciándose un procesu de notificación d'errores."
3310
3311-#: ../DistUpgrade/DistUpgradeController.py:836
3312+#: ../DistUpgrade/DistUpgradeController.py:827
3313 msgid "Third party sources disabled"
3314 msgstr "Desactivar fontes de terceres partes"
3315
3316-#: ../DistUpgrade/DistUpgradeController.py:837
3317+#: ../DistUpgrade/DistUpgradeController.py:828
3318 msgid ""
3319 "Some third party entries in your sources.list were disabled. You can re-"
3320 "enable them after the upgrade with the 'software-properties' tool or your "
3321@@ -469,13 +469,13 @@
3322 "a activales tres l'anovamientu cola ferramienta «Oríxenes del software», o "
3323 "col xestor de paquetes."
3324
3325-#: ../DistUpgrade/DistUpgradeController.py:879
3326+#: ../DistUpgrade/DistUpgradeController.py:870
3327 msgid "Package in inconsistent state"
3328 msgid_plural "Packages in inconsistent state"
3329 msgstr[0] "Paquete nun estáu inconsistente"
3330 msgstr[1] "Paquetes nun estáu inconsistente"
3331
3332-#: ../DistUpgrade/DistUpgradeController.py:882
3333+#: ../DistUpgrade/DistUpgradeController.py:873
3334 #, python-format
3335 msgid ""
3336 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
3337@@ -494,11 +494,11 @@
3338 "nun s'alcuentren en dengún repositoriu. Por favor, reinstale los paquetes "
3339 "manualmente o desinstálelos del sistema"
3340
3341-#: ../DistUpgrade/DistUpgradeController.py:930
3342+#: ../DistUpgrade/DistUpgradeController.py:921
3343 msgid "Error during update"
3344 msgstr "Fallu durante l'anovamientu"
3345
3346-#: ../DistUpgrade/DistUpgradeController.py:931
3347+#: ../DistUpgrade/DistUpgradeController.py:922
3348 msgid ""
3349 "A problem occurred during the update. This is usually some sort of network "
3350 "problem, please check your network connection and retry."
3351@@ -507,11 +507,11 @@
3352 "rede, polo qu'encamentámoste que compruebes la conexón de rede y tornes a "
3353 "intentalo."
3354
3355-#: ../DistUpgrade/DistUpgradeController.py:940
3356+#: ../DistUpgrade/DistUpgradeController.py:931
3357 msgid "Not enough free disk space"
3358 msgstr "Nun hai suficiente espaciu llibre en discu"
3359
3360-#: ../DistUpgrade/DistUpgradeController.py:941
3361+#: ../DistUpgrade/DistUpgradeController.py:932
3362 #, python-format
3363 msgid ""
3364 "The upgrade has aborted. The upgrade needs a total of %s free space on disk "
3365@@ -526,21 +526,21 @@
3366
3367 #. calc the dist-upgrade and see if the removals are ok/expected
3368 #. do the dist-upgrade
3369-#: ../DistUpgrade/DistUpgradeController.py:970
3370-#: ../DistUpgrade/DistUpgradeController.py:1778
3371+#: ../DistUpgrade/DistUpgradeController.py:961
3372+#: ../DistUpgrade/DistUpgradeController.py:1743
3373 msgid "Calculating the changes"
3374 msgstr "Calculando los cambeos"
3375
3376 #. ask the user
3377-#: ../DistUpgrade/DistUpgradeController.py:1002
3378+#: ../DistUpgrade/DistUpgradeController.py:993
3379 msgid "Do you want to start the upgrade?"
3380 msgstr "¿Quies aniciar l'anovamientu?"
3381
3382-#: ../DistUpgrade/DistUpgradeController.py:1075
3383+#: ../DistUpgrade/DistUpgradeController.py:1066
3384 msgid "Upgrade canceled"
3385 msgstr "Anovamientu encaboxáu"
3386
3387-#: ../DistUpgrade/DistUpgradeController.py:1076
3388+#: ../DistUpgrade/DistUpgradeController.py:1067
3389 msgid ""
3390 "The upgrade will cancel now and the original system state will be restored. "
3391 "You can resume the upgrade at a later time."
3392@@ -548,12 +548,12 @@
3393 "L'anovamientu va encaboxase agora y el sistema va volver al so estáu "
3394 "orixinal. Pues reanudar l'anovamientu más sero."
3395
3396-#: ../DistUpgrade/DistUpgradeController.py:1082
3397-#: ../DistUpgrade/DistUpgradeController.py:1206
3398+#: ../DistUpgrade/DistUpgradeController.py:1073
3399+#: ../DistUpgrade/DistUpgradeController.py:1197
3400 msgid "Could not download the upgrades"
3401 msgstr "Nun se puede descargar les actualizaciones"
3402
3403-#: ../DistUpgrade/DistUpgradeController.py:1083
3404+#: ../DistUpgrade/DistUpgradeController.py:1074
3405 msgid ""
3406 "The upgrade has aborted. Please check your Internet connection or "
3407 "installation media and try again. All files downloaded so far have been kept."
3408@@ -564,27 +564,27 @@
3409
3410 #. FIXME: strings are not good, but we are in string freeze
3411 #. currently
3412-#: ../DistUpgrade/DistUpgradeController.py:1157
3413-#: ../DistUpgrade/DistUpgradeController.py:1194
3414-#: ../DistUpgrade/DistUpgradeController.py:1299
3415+#: ../DistUpgrade/DistUpgradeController.py:1148
3416+#: ../DistUpgrade/DistUpgradeController.py:1185
3417+#: ../DistUpgrade/DistUpgradeController.py:1290
3418 msgid "Error during commit"
3419 msgstr "Error durante la confirmación"
3420
3421 #. generate a new cache
3422-#: ../DistUpgrade/DistUpgradeController.py:1159
3423-#: ../DistUpgrade/DistUpgradeController.py:1196
3424-#: ../DistUpgrade/DistUpgradeController.py:1338
3425+#: ../DistUpgrade/DistUpgradeController.py:1150
3426+#: ../DistUpgrade/DistUpgradeController.py:1187
3427+#: ../DistUpgrade/DistUpgradeController.py:1329
3428 msgid "Restoring original system state"
3429 msgstr "Restaurando al estau del sistema orixinal"
3430
3431-#: ../DistUpgrade/DistUpgradeController.py:1160
3432-#: ../DistUpgrade/DistUpgradeController.py:1175
3433-#: ../DistUpgrade/DistUpgradeController.py:1197
3434+#: ../DistUpgrade/DistUpgradeController.py:1151
3435+#: ../DistUpgrade/DistUpgradeController.py:1166
3436+#: ../DistUpgrade/DistUpgradeController.py:1188
3437 msgid "Could not install the upgrades"
3438 msgstr "Nun pudieron instalase los anovamientos"
3439
3440 #. invoke the frontend now and show a error message
3441-#: ../DistUpgrade/DistUpgradeController.py:1165
3442+#: ../DistUpgrade/DistUpgradeController.py:1156
3443 msgid ""
3444 "The upgrade has aborted. Your system could be in an unusable state. A "
3445 "recovery will run now (dpkg --configure -a)."
3446@@ -592,7 +592,7 @@
3447 "Encaboxóse l'anovamientu. Pue que'l sistema quedare nun estáu non usable. "
3448 "Agora, va facese una recuperación (dpkg --configure -a)."
3449
3450-#: ../DistUpgrade/DistUpgradeController.py:1170
3451+#: ../DistUpgrade/DistUpgradeController.py:1161
3452 #, python-format
3453 msgid ""
3454 "\n"
3455@@ -609,7 +609,7 @@
3456 "axunta los ficheros en /var/log/dist-upgrade/ al informe.\n"
3457 "%s"
3458
3459-#: ../DistUpgrade/DistUpgradeController.py:1207
3460+#: ../DistUpgrade/DistUpgradeController.py:1198
3461 msgid ""
3462 "The upgrade has aborted. Please check your Internet connection or "
3463 "installation media and try again. "
3464@@ -617,20 +617,20 @@
3465 "Encaboxóse l'anovamientu. Por favor, comprueba la conexón a Internet o el "
3466 "sofitu d'instalación y vuelvi a intentalo. "
3467
3468-#: ../DistUpgrade/DistUpgradeController.py:1287
3469+#: ../DistUpgrade/DistUpgradeController.py:1278
3470 msgid "Remove obsolete packages?"
3471 msgstr "¿Desaniciar paquetes obsoletos?"
3472
3473-#: ../DistUpgrade/DistUpgradeController.py:1288
3474+#: ../DistUpgrade/DistUpgradeController.py:1279
3475 #: ../data/gtkbuilder/DistUpgrade.ui.h:8
3476 msgid "_Keep"
3477 msgstr "_Caltener"
3478
3479-#: ../DistUpgrade/DistUpgradeController.py:1288
3480+#: ../DistUpgrade/DistUpgradeController.py:1279
3481 msgid "_Remove"
3482 msgstr "_Esborrar"
3483
3484-#: ../DistUpgrade/DistUpgradeController.py:1300
3485+#: ../DistUpgrade/DistUpgradeController.py:1291
3486 msgid ""
3487 "A problem occurred during the clean-up. Please see the below message for "
3488 "more information. "
3489@@ -640,28 +640,27 @@
3490
3491 #. FIXME: instead of error out, fetch and install it
3492 #. here
3493-#: ../DistUpgrade/DistUpgradeController.py:1376
3494+#: ../DistUpgrade/DistUpgradeController.py:1367
3495 msgid "Required depends is not installed"
3496 msgstr "Dependencia requería nun ta instalada"
3497
3498-#: ../DistUpgrade/DistUpgradeController.py:1377
3499+#: ../DistUpgrade/DistUpgradeController.py:1368
3500 #, python-format
3501 msgid "The required dependency '%s' is not installed. "
3502 msgstr "La dependencia requería «%s» nun ta instalada. "
3503
3504 #. sanity check (check for ubuntu-desktop, brokenCache etc)
3505 #. then open the cache (again)
3506-#: ../DistUpgrade/DistUpgradeController.py:1645
3507-#: ../DistUpgrade/DistUpgradeController.py:1732
3508+#: ../DistUpgrade/DistUpgradeController.py:1636
3509+#: ../DistUpgrade/DistUpgradeController.py:1701
3510 msgid "Checking package manager"
3511 msgstr "Comprobando'l xestor de paquetes"
3512
3513-#: ../DistUpgrade/DistUpgradeController.py:1651
3514-#: ../DistUpgrade/DistUpgradeController.py:1657
3515+#: ../DistUpgrade/DistUpgradeController.py:1641
3516 msgid "Preparing the upgrade failed"
3517 msgstr "Falló la tresna del anovamientu"
3518
3519-#: ../DistUpgrade/DistUpgradeController.py:1652
3520+#: ../DistUpgrade/DistUpgradeController.py:1642
3521 msgid ""
3522 "Preparing the system for the upgrade failed so a bug reporting process is "
3523 "being started."
3524@@ -669,12 +668,11 @@
3525 "Hebo un fallu al preparar el sistema pal anovamientu poro, ta arrancando un "
3526 "procesu de notificación de fallos."
3527
3528-#: ../DistUpgrade/DistUpgradeController.py:1675
3529-#: ../DistUpgrade/DistUpgradeController.py:1685
3530+#: ../DistUpgrade/DistUpgradeController.py:1656
3531 msgid "Getting upgrade prerequisites failed"
3532 msgstr "Falló la tresna del anovamientu"
3533
3534-#: ../DistUpgrade/DistUpgradeController.py:1676
3535+#: ../DistUpgrade/DistUpgradeController.py:1657
3536 msgid ""
3537 "The system was unable to get the prerequisites for the upgrade. The upgrade "
3538 "will abort now and restore the original system state.\n"
3539@@ -687,23 +685,23 @@
3540 "\n"
3541 "Adicionalmente, ta aniciándose un procesu de notificación d'errores."
3542
3543-#: ../DistUpgrade/DistUpgradeController.py:1716
3544+#: ../DistUpgrade/DistUpgradeController.py:1685
3545 msgid "Updating repository information"
3546 msgstr "Anovando información del repositoriu"
3547
3548-#: ../DistUpgrade/DistUpgradeController.py:1723
3549+#: ../DistUpgrade/DistUpgradeController.py:1692
3550 msgid "Failed to add the cdrom"
3551 msgstr "Fallu al amestar el CDROM"
3552
3553-#: ../DistUpgrade/DistUpgradeController.py:1724
3554+#: ../DistUpgrade/DistUpgradeController.py:1693
3555 msgid "Sorry, adding the cdrom was not successful."
3556 msgstr "Sentímoslo, nun pudo amestase'l CDROM"
3557
3558-#: ../DistUpgrade/DistUpgradeController.py:1755
3559+#: ../DistUpgrade/DistUpgradeController.py:1724
3560 msgid "Invalid package information"
3561 msgstr "Información del paquete nun válida"
3562
3563-#: ../DistUpgrade/DistUpgradeController.py:1756
3564+#: ../DistUpgrade/DistUpgradeController.py:1725
3565 #, python-format
3566 msgid ""
3567 "After updating your package information, the essential package '%s' could "
3568@@ -715,60 +713,60 @@
3569 "later."
3570 msgstr ""
3571
3572-#: ../DistUpgrade/DistUpgradeController.py:1784
3573-#: ../DistUpgrade/DistUpgradeController.py:1840
3574+#: ../DistUpgrade/DistUpgradeController.py:1749
3575+#: ../DistUpgrade/DistUpgradeController.py:1805
3576 msgid "Fetching"
3577 msgstr "Descargando"
3578
3579-#: ../DistUpgrade/DistUpgradeController.py:1790
3580-#: ../DistUpgrade/DistUpgradeController.py:1844
3581+#: ../DistUpgrade/DistUpgradeController.py:1755
3582+#: ../DistUpgrade/DistUpgradeController.py:1809
3583 msgid "Upgrading"
3584 msgstr "Anovando"
3585
3586 #. don't abort here, because it would restore the sources.list
3587-#: ../DistUpgrade/DistUpgradeController.py:1795
3588-#: ../DistUpgrade/DistUpgradeController.py:1846
3589-#: ../DistUpgrade/DistUpgradeController.py:1853
3590-#: ../DistUpgrade/DistUpgradeController.py:1864
3591+#: ../DistUpgrade/DistUpgradeController.py:1760
3592+#: ../DistUpgrade/DistUpgradeController.py:1811
3593+#: ../DistUpgrade/DistUpgradeController.py:1818
3594+#: ../DistUpgrade/DistUpgradeController.py:1829
3595 msgid "Upgrade complete"
3596 msgstr "Completóse l'anovamientu"
3597
3598-#: ../DistUpgrade/DistUpgradeController.py:1796
3599-#: ../DistUpgrade/DistUpgradeController.py:1847
3600-#: ../DistUpgrade/DistUpgradeController.py:1854
3601+#: ../DistUpgrade/DistUpgradeController.py:1761
3602+#: ../DistUpgrade/DistUpgradeController.py:1812
3603+#: ../DistUpgrade/DistUpgradeController.py:1819
3604 msgid ""
3605 "The upgrade has completed but there were errors during the upgrade process."
3606 msgstr "L'anovamientu completóse pero hebo fallos durante'l procesu."
3607
3608-#: ../DistUpgrade/DistUpgradeController.py:1803
3609+#: ../DistUpgrade/DistUpgradeController.py:1768
3610 msgid "Searching for obsolete software"
3611 msgstr "Buscando software obsoletu"
3612
3613-#: ../DistUpgrade/DistUpgradeController.py:1816
3614+#: ../DistUpgrade/DistUpgradeController.py:1781
3615 msgid "System upgrade is complete."
3616 msgstr "anovamientu del sistema completáu"
3617
3618-#: ../DistUpgrade/DistUpgradeController.py:1865
3619+#: ../DistUpgrade/DistUpgradeController.py:1830
3620 msgid "The partial upgrade was completed."
3621 msgstr "L'anovamientu parcial completóse."
3622
3623 #: ../DistUpgrade/DistUpgradeFetcher.py:123
3624-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:117
3625+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:119
3626 msgid "Could not find the release notes"
3627 msgstr "Nun s'alcontraron les notes de publicación"
3628
3629 #: ../DistUpgrade/DistUpgradeFetcher.py:124
3630-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:118
3631+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:120
3632 msgid "The server may be overloaded. "
3633 msgstr "Puede que'l sirvidor tea sobrocargáu. "
3634
3635 #: ../DistUpgrade/DistUpgradeFetcher.py:136
3636-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:122
3637+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:124
3638 msgid "Could not download the release notes"
3639 msgstr "Nun pudieron descargase les notes d'espublización"
3640
3641 #: ../DistUpgrade/DistUpgradeFetcher.py:137
3642-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:123
3643+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:125
3644 msgid "Please check your internet connection."
3645 msgstr "Por favor, comprueba la conexón a Internet."
3646
3647@@ -777,17 +775,17 @@
3648 msgid "authenticate '%(file)s' against '%(signature)s' "
3649 msgstr "autentificar «%(file)s» escontra «%(signature)s» "
3650
3651-#: ../DistUpgrade/DistUpgradeFetcherCore.py:139
3652+#: ../DistUpgrade/DistUpgradeFetcherCore.py:136
3653 #, python-format
3654 msgid "extracting '%s'"
3655 msgstr "estrayendo «%s»"
3656
3657-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
3658-#: ../DistUpgrade/DistUpgradeFetcherCore.py:161
3659+#: ../DistUpgrade/DistUpgradeFetcherCore.py:157
3660+#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
3661 msgid "Could not run the upgrade tool"
3662 msgstr "Nun pudo executase la ferramienta d'anovamientu"
3663
3664-#: ../DistUpgrade/DistUpgradeFetcherCore.py:162
3665+#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
3666 msgid ""
3667 "This is most likely a bug in the upgrade tool. Please report it as a bug "
3668 "using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
3669@@ -795,27 +793,27 @@
3670 "Lo más probable ye qu'esto seya un fallu na ferramienta d'anovamientos. "
3671 "Informa d'esto cola orde «ubuntu-bug ubuntu-release-upgrader-core»."
3672
3673-#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
3674+#: ../DistUpgrade/DistUpgradeFetcherCore.py:236
3675 msgid "Upgrade tool signature"
3676 msgstr "Robla de la ferramienta d'anovamientu"
3677
3678-#: ../DistUpgrade/DistUpgradeFetcherCore.py:246
3679+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
3680 msgid "Upgrade tool"
3681 msgstr "Ferramienta d'anovamientu"
3682
3683-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
3684+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
3685 msgid "Failed to fetch"
3686 msgstr "Fallu al descargar"
3687
3688-#: ../DistUpgrade/DistUpgradeFetcherCore.py:281
3689+#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
3690 msgid "Fetching the upgrade failed. There may be a network problem. "
3691 msgstr "Falló la baxada del anovamientu. Pue haber un problema cola rede. "
3692
3693-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
3694+#: ../DistUpgrade/DistUpgradeFetcherCore.py:282
3695 msgid "Authentication failed"
3696 msgstr "Falló l'autentificación"
3697
3698-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
3699+#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
3700 msgid ""
3701 "Authenticating the upgrade failed. There may be a problem with the network "
3702 "or with the server. "
3703@@ -823,11 +821,11 @@
3704 "Falló l'autentificación de l'anovamientu. Ye dable qu'heba un problema cola "
3705 "rede o col sirvidor. "
3706
3707-#: ../DistUpgrade/DistUpgradeFetcherCore.py:291
3708+#: ../DistUpgrade/DistUpgradeFetcherCore.py:288
3709 msgid "Failed to extract"
3710 msgstr "Fallu al sacar"
3711
3712-#: ../DistUpgrade/DistUpgradeFetcherCore.py:292
3713+#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
3714 msgid ""
3715 "Extracting the upgrade failed. There may be a problem with the network or "
3716 "with the server. "
3717@@ -835,11 +833,11 @@
3718 "Falló la estraición del anovamientu. Pue haber un problema cola rede o col "
3719 "sirvidor. "
3720
3721-#: ../DistUpgrade/DistUpgradeFetcherCore.py:297
3722+#: ../DistUpgrade/DistUpgradeFetcherCore.py:294
3723 msgid "Verification failed"
3724 msgstr "Falló la verificación"
3725
3726-#: ../DistUpgrade/DistUpgradeFetcherCore.py:298
3727+#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
3728 msgid ""
3729 "Verifying the upgrade failed. There may be a problem with the network or "
3730 "with the server. "
3731@@ -847,12 +845,12 @@
3732 "Falló la verificación del anovamientu. Pue haber un problema cola rede o col "
3733 "sirvidor. "
3734
3735-#: ../DistUpgrade/DistUpgradeFetcherCore.py:312
3736-#: ../DistUpgrade/DistUpgradeFetcherCore.py:318
3737+#: ../DistUpgrade/DistUpgradeFetcherCore.py:309
3738+#: ../DistUpgrade/DistUpgradeFetcherCore.py:315
3739 msgid "Can not run the upgrade"
3740 msgstr "Nun puede executase l'anovamientu"
3741
3742-#: ../DistUpgrade/DistUpgradeFetcherCore.py:313
3743+#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
3744 msgid ""
3745 "This usually is caused by a system where /tmp is mounted noexec. Please "
3746 "remount without noexec and run the upgrade again."
3747@@ -860,38 +858,38 @@
3748 "Esto davezu cáusalo un sistema nel que /tmp se montó como non executable. "
3749 "Vuelvi a montalu ensin «noexec» y executa otra vuelta l'anovamientu."
3750
3751-#: ../DistUpgrade/DistUpgradeFetcherCore.py:319
3752+#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
3753 #, python-format
3754 msgid "The error message is '%s'."
3755 msgstr "El mensax de fallu ye «%s»"
3756
3757-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:68
3758-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:99
3759+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:70
3760+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:101
3761 msgid "Upgrade"
3762 msgstr "Anovar"
3763
3764-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:103
3765+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:105
3766 #: ../data/gtkbuilder/ReleaseNotes.ui.h:1
3767 msgid "Release Notes"
3768 msgstr "Notes de la versión"
3769
3770-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:145
3771-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:158
3772+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:147
3773+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:160
3774 msgid "Downloading additional package files..."
3775 msgstr "Descargando ficheros de paquetes adicionales..."
3776
3777-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:160
3778+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:162
3779 #, python-format
3780 msgid "File %s of %s at %sB/s"
3781 msgstr "Ficheru %s de %s a %sB/s"
3782
3783-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:164
3784+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:166
3785 #, python-format
3786 msgid "File %s of %s"
3787 msgstr "Ficheru %s de %s"
3788
3789 #. print("mediaChange %s %s" % (medium, drive))
3790-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:171
3791+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:173
3792 #: ../DistUpgrade/DistUpgradeViewGtk.py:114
3793 #: ../DistUpgrade/DistUpgradeViewGtk3.py:115
3794 #: ../DistUpgrade/DistUpgradeViewKDE.py:196
3795@@ -901,8 +899,8 @@
3796
3797 #. change = QMessageBox.question(None, _("Media Change"), msg,
3798 #. QMessageBox.Ok, QMessageBox.Cancel)
3799-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:174
3800-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:175
3801+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:176
3802+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:177
3803 #: ../DistUpgrade/DistUpgradeViewKDE.py:197
3804 msgid "Media Change"
3805 msgstr "Cambéu de preséu"
3806@@ -925,7 +923,7 @@
3807 msgid "Your graphics hardware may not be fully supported in Ubuntu 13.04."
3808 msgstr ""
3809
3810-#: ../DistUpgrade/DistUpgradeQuirks.py:250
3811+#: ../DistUpgrade/DistUpgradeQuirks.py:248
3812 msgid ""
3813 "Running the 'unity' desktop environment is not fully supported by your "
3814 "graphics hardware. You will maybe end up in a very slow environment after "
3815@@ -941,13 +939,13 @@
3816 "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForUnity3D ¿Aínda quies "
3817 "siguir col anovamientu?"
3818
3819-#: ../DistUpgrade/DistUpgradeQuirks.py:274
3820+#: ../DistUpgrade/DistUpgradeQuirks.py:272
3821 msgid ""
3822 "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
3823 msgstr ""
3824 "El hardware de gráficos nun ye compatible dafechu con Ubuntu 12.04 LTS."
3825
3826-#: ../DistUpgrade/DistUpgradeQuirks.py:276
3827+#: ../DistUpgrade/DistUpgradeQuirks.py:274
3828 msgid ""
3829 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
3830 "and you may encounter problems after the upgrade. For more information see "
3831@@ -959,7 +957,7 @@
3832 "información llei https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx "
3833 "¿Quies siguir col anovamientu?"
3834
3835-#: ../DistUpgrade/DistUpgradeQuirks.py:296
3836+#: ../DistUpgrade/DistUpgradeQuirks.py:294
3837 msgid ""
3838 "Upgrading may reduce desktop effects, and performance in games and other "
3839 "graphically intensive programs."
3840@@ -983,7 +981,7 @@
3841 "\n"
3842 "¿Quier continuar?"
3843
3844-#: ../DistUpgrade/DistUpgradeQuirks.py:300
3845+#: ../DistUpgrade/DistUpgradeQuirks.py:298
3846 msgid ""
3847 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
3848 "of this driver is available that works with your hardware in Ubuntu 10.04 "
3849@@ -997,11 +995,11 @@
3850 "\n"
3851 "¿Quier continuar?"
3852
3853-#: ../DistUpgrade/DistUpgradeQuirks.py:335
3854+#: ../DistUpgrade/DistUpgradeQuirks.py:333
3855 msgid "No i686 CPU"
3856 msgstr "La CPU nun ye i686"
3857
3858-#: ../DistUpgrade/DistUpgradeQuirks.py:336
3859+#: ../DistUpgrade/DistUpgradeQuirks.py:334
3860 msgid ""
3861 "Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
3862 "extension. All packages were built with optimizations requiring i686 as the "
3863@@ -1013,11 +1011,11 @@
3864 "arquiteutura mínima. Nun ye posible anovar el sistema a una versión nueva "
3865 "d'Ubuntu con esti hardware."
3866
3867-#: ../DistUpgrade/DistUpgradeQuirks.py:372
3868+#: ../DistUpgrade/DistUpgradeQuirks.py:370
3869 msgid "No ARMv6 CPU"
3870 msgstr "No ARMv6 CPU"
3871
3872-#: ../DistUpgrade/DistUpgradeQuirks.py:373
3873+#: ../DistUpgrade/DistUpgradeQuirks.py:371
3874 msgid ""
3875 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
3876 "packages in karmic were built with optimizations requiring ARMv6 as the "
3877@@ -1029,11 +1027,11 @@
3878 "ARMv6 como arquiteutura mínima. Nun ye dable anovar el so sistema a la nueva "
3879 "versión d'Ubuntu con esti hardware."
3880
3881-#: ../DistUpgrade/DistUpgradeQuirks.py:393
3882+#: ../DistUpgrade/DistUpgradeQuirks.py:391
3883 msgid "No init available"
3884 msgstr "El degorriu init nun ta disponible"
3885
3886-#: ../DistUpgrade/DistUpgradeQuirks.py:394
3887+#: ../DistUpgrade/DistUpgradeQuirks.py:392
3888 msgid ""
3889 "Your system appears to be a virtualised environment without an init daemon, "
3890 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
3891@@ -1816,15 +1814,15 @@
3892 "Namái comprueba si ta disponible una nueva versión de la distribución ya "
3893 "informa del resultáu per aciu d'un códigu de salida"
3894
3895-#: ../do-release-upgrade:113
3896+#: ../do-release-upgrade:108
3897 msgid "Checking for a new Ubuntu release"
3898 msgstr "Comprobar si hai una versión nueva d'Ubuntu"
3899
3900-#: ../do-release-upgrade:125
3901+#: ../do-release-upgrade:121
3902 msgid "Your Ubuntu release is not supported anymore."
3903 msgstr "La to versión d'Ubuntu yá nun tien sofitu téunicu."
3904
3905-#: ../do-release-upgrade:126
3906+#: ../do-release-upgrade:122
3907 msgid ""
3908 "For upgrade information, please visit:\n"
3909 "%(url)s\n"
3910@@ -1832,15 +1830,15 @@
3911 "Pa saber más tocante a esti anovamientu, visita:\n"
3912 "%(url)s\n"
3913
3914-#: ../do-release-upgrade:132
3915+#: ../do-release-upgrade:128
3916 msgid "No new release found"
3917 msgstr "Nun s'alcontró denguna edición nueva"
3918
3919-#: ../do-release-upgrade:137
3920+#: ../do-release-upgrade:133
3921 msgid "Release upgrade not possible right now"
3922 msgstr "L'anovamientu de versión nun ye posible nesti intre"
3923
3924-#: ../do-release-upgrade:138
3925+#: ../do-release-upgrade:134
3926 #, c-format
3927 msgid ""
3928 "The release upgrade can not be performed currently, please try again later. "
3929@@ -1849,12 +1847,12 @@
3930 "L'anovamientu de versión nun ye posible nesti intre, inténtalo más sero. El "
3931 "sirvidor informó: «%s»"
3932
3933-#: ../do-release-upgrade:144
3934+#: ../do-release-upgrade:140
3935 #, c-format
3936 msgid "New release '%s' available."
3937 msgstr "Ta disponible la nueva versión «%s»."
3938
3939-#: ../do-release-upgrade:145
3940+#: ../do-release-upgrade:141
3941 msgid "Run 'do-release-upgrade' to upgrade to it."
3942 msgstr "Executar 'do-release-upgrade' p'anovase a élli."
3943
3944
3945=== modified file 'po/az.po'
3946--- po/az.po 2014-04-07 14:07:10 +0000
3947+++ po/az.po 2021-05-11 08:09:06 +0000
3948@@ -15,12 +15,12 @@
3949 "Content-Type: text/plain; charset=UTF-8\n"
3950 "Content-Transfer-Encoding: 8bit\n"
3951 "Plural-Forms: nplurals=2; plural=n != 1;\n"
3952-"X-Launchpad-Export-Date: 2014-04-05 06:07+0000\n"
3953-"X-Generator: Launchpad (build 16976)\n"
3954+"X-Launchpad-Export-Date: 2014-04-23 06:50+0000\n"
3955+"X-Generator: Launchpad (build 16985)\n"
3956 "Language: az\n"
3957
3958 #. TRANSLATORS: %s is a country
3959-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
3960+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:441
3961 #, python-format
3962 msgid "Server for %s"
3963 msgstr "%s üçün Server"
3964@@ -175,18 +175,19 @@
3965 msgid "Trying to install blacklisted version '%s'"
3966 msgstr ""
3967
3968-#: ../DistUpgrade/DistUpgradeCache.py:860
3969+#: ../DistUpgrade/DistUpgradeCache.py:859
3970 #, python-format
3971 msgid "Can't install '%s'"
3972 msgstr "'%s' qurula bilmir"
3973
3974-#: ../DistUpgrade/DistUpgradeCache.py:861
3975+#: ../DistUpgrade/DistUpgradeCache.py:860
3976 msgid ""
3977 "It was impossible to install a required package. Please report this as a bug "
3978 "using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
3979 msgstr ""
3980
3981-#: ../DistUpgrade/DistUpgradeCache.py:872
3982+#. FIXME: provide a list
3983+#: ../DistUpgrade/DistUpgradeCache.py:871
3984 msgid "Can't guess meta-package"
3985 msgstr "Meta-paketlər müəyyən olunabilmədi"
3986
3987@@ -377,35 +378,34 @@
3988 "will cancel."
3989 msgstr ""
3990
3991-#: ../DistUpgrade/DistUpgradeController.py:820
3992-#: ../DistUpgrade/DistUpgradeController.py:826
3993+#: ../DistUpgrade/DistUpgradeController.py:819
3994 msgid "Repository information invalid"
3995 msgstr "Saxlanc məlumatı xətalıdır"
3996
3997-#: ../DistUpgrade/DistUpgradeController.py:821
3998+#: ../DistUpgrade/DistUpgradeController.py:820
3999 msgid ""
4000 "Upgrading the repository information resulted in a invalid file so a bug "
4001 "reporting process is being started."
4002 msgstr ""
4003
4004-#: ../DistUpgrade/DistUpgradeController.py:836
4005+#: ../DistUpgrade/DistUpgradeController.py:827
4006 msgid "Third party sources disabled"
4007 msgstr ""
4008
4009-#: ../DistUpgrade/DistUpgradeController.py:837
4010+#: ../DistUpgrade/DistUpgradeController.py:828
4011 msgid ""
4012 "Some third party entries in your sources.list were disabled. You can re-"
4013 "enable them after the upgrade with the 'software-properties' tool or your "
4014 "package manager."
4015 msgstr ""
4016
4017-#: ../DistUpgrade/DistUpgradeController.py:879
4018+#: ../DistUpgrade/DistUpgradeController.py:870
4019 msgid "Package in inconsistent state"
4020 msgid_plural "Packages in inconsistent state"
4021 msgstr[0] ""
4022 msgstr[1] ""
4023
4024-#: ../DistUpgrade/DistUpgradeController.py:882
4025+#: ../DistUpgrade/DistUpgradeController.py:873
4026 #, python-format
4027 msgid ""
4028 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
4029@@ -418,21 +418,21 @@
4030 msgstr[0] ""
4031 msgstr[1] ""
4032
4033-#: ../DistUpgrade/DistUpgradeController.py:930
4034+#: ../DistUpgrade/DistUpgradeController.py:921
4035 msgid "Error during update"
4036 msgstr "Yeniləmə vaxtı xəta"
4037
4038-#: ../DistUpgrade/DistUpgradeController.py:931
4039+#: ../DistUpgrade/DistUpgradeController.py:922
4040 msgid ""
4041 "A problem occurred during the update. This is usually some sort of network "
4042 "problem, please check your network connection and retry."
4043 msgstr ""
4044
4045-#: ../DistUpgrade/DistUpgradeController.py:940
4046+#: ../DistUpgrade/DistUpgradeController.py:931
4047 msgid "Not enough free disk space"
4048 msgstr "Kifayət qədər boş disk sahəsi yoxdur"
4049
4050-#: ../DistUpgrade/DistUpgradeController.py:941
4051+#: ../DistUpgrade/DistUpgradeController.py:932
4052 #, python-format
4053 msgid ""
4054 "The upgrade has aborted. The upgrade needs a total of %s free space on disk "
4055@@ -443,32 +443,32 @@
4056
4057 #. calc the dist-upgrade and see if the removals are ok/expected
4058 #. do the dist-upgrade
4059-#: ../DistUpgrade/DistUpgradeController.py:970
4060-#: ../DistUpgrade/DistUpgradeController.py:1778
4061+#: ../DistUpgrade/DistUpgradeController.py:961
4062+#: ../DistUpgrade/DistUpgradeController.py:1743
4063 msgid "Calculating the changes"
4064 msgstr ""
4065
4066 #. ask the user
4067-#: ../DistUpgrade/DistUpgradeController.py:1002
4068+#: ../DistUpgrade/DistUpgradeController.py:993
4069 msgid "Do you want to start the upgrade?"
4070 msgstr "Sistemin yenilənməsini başlamaq istəyirsinizmi?"
4071
4072-#: ../DistUpgrade/DistUpgradeController.py:1075
4073+#: ../DistUpgrade/DistUpgradeController.py:1066
4074 msgid "Upgrade canceled"
4075 msgstr ""
4076
4077-#: ../DistUpgrade/DistUpgradeController.py:1076
4078+#: ../DistUpgrade/DistUpgradeController.py:1067
4079 msgid ""
4080 "The upgrade will cancel now and the original system state will be restored. "
4081 "You can resume the upgrade at a later time."
4082 msgstr ""
4083
4084-#: ../DistUpgrade/DistUpgradeController.py:1082
4085-#: ../DistUpgrade/DistUpgradeController.py:1206
4086+#: ../DistUpgrade/DistUpgradeController.py:1073
4087+#: ../DistUpgrade/DistUpgradeController.py:1197
4088 msgid "Could not download the upgrades"
4089 msgstr "Yeniləmələr endirilə bilmədi"
4090
4091-#: ../DistUpgrade/DistUpgradeController.py:1083
4092+#: ../DistUpgrade/DistUpgradeController.py:1074
4093 msgid ""
4094 "The upgrade has aborted. Please check your Internet connection or "
4095 "installation media and try again. All files downloaded so far have been kept."
4096@@ -476,33 +476,33 @@
4097
4098 #. FIXME: strings are not good, but we are in string freeze
4099 #. currently
4100-#: ../DistUpgrade/DistUpgradeController.py:1157
4101-#: ../DistUpgrade/DistUpgradeController.py:1194
4102-#: ../DistUpgrade/DistUpgradeController.py:1299
4103+#: ../DistUpgrade/DistUpgradeController.py:1148
4104+#: ../DistUpgrade/DistUpgradeController.py:1185
4105+#: ../DistUpgrade/DistUpgradeController.py:1290
4106 msgid "Error during commit"
4107 msgstr ""
4108
4109 #. generate a new cache
4110-#: ../DistUpgrade/DistUpgradeController.py:1159
4111-#: ../DistUpgrade/DistUpgradeController.py:1196
4112-#: ../DistUpgrade/DistUpgradeController.py:1338
4113+#: ../DistUpgrade/DistUpgradeController.py:1150
4114+#: ../DistUpgrade/DistUpgradeController.py:1187
4115+#: ../DistUpgrade/DistUpgradeController.py:1329
4116 msgid "Restoring original system state"
4117 msgstr ""
4118
4119-#: ../DistUpgrade/DistUpgradeController.py:1160
4120-#: ../DistUpgrade/DistUpgradeController.py:1175
4121-#: ../DistUpgrade/DistUpgradeController.py:1197
4122+#: ../DistUpgrade/DistUpgradeController.py:1151
4123+#: ../DistUpgrade/DistUpgradeController.py:1166
4124+#: ../DistUpgrade/DistUpgradeController.py:1188
4125 msgid "Could not install the upgrades"
4126 msgstr "Yeniləmələr qurula bilmədi"
4127
4128 #. invoke the frontend now and show a error message
4129-#: ../DistUpgrade/DistUpgradeController.py:1165
4130+#: ../DistUpgrade/DistUpgradeController.py:1156
4131 msgid ""
4132 "The upgrade has aborted. Your system could be in an unusable state. A "
4133 "recovery will run now (dpkg --configure -a)."
4134 msgstr ""
4135
4136-#: ../DistUpgrade/DistUpgradeController.py:1170
4137+#: ../DistUpgrade/DistUpgradeController.py:1161
4138 #, python-format
4139 msgid ""
4140 "\n"
4141@@ -513,26 +513,26 @@
4142 "%s"
4143 msgstr ""
4144
4145-#: ../DistUpgrade/DistUpgradeController.py:1207
4146+#: ../DistUpgrade/DistUpgradeController.py:1198
4147 msgid ""
4148 "The upgrade has aborted. Please check your Internet connection or "
4149 "installation media and try again. "
4150 msgstr ""
4151
4152-#: ../DistUpgrade/DistUpgradeController.py:1287
4153+#: ../DistUpgrade/DistUpgradeController.py:1278
4154 msgid "Remove obsolete packages?"
4155 msgstr ""
4156
4157-#: ../DistUpgrade/DistUpgradeController.py:1288
4158+#: ../DistUpgrade/DistUpgradeController.py:1279
4159 #: ../data/gtkbuilder/DistUpgrade.ui.h:8
4160 msgid "_Keep"
4161 msgstr "_Saxla"
4162
4163-#: ../DistUpgrade/DistUpgradeController.py:1288
4164+#: ../DistUpgrade/DistUpgradeController.py:1279
4165 msgid "_Remove"
4166 msgstr "_Sil"
4167
4168-#: ../DistUpgrade/DistUpgradeController.py:1300
4169+#: ../DistUpgrade/DistUpgradeController.py:1291
4170 msgid ""
4171 "A problem occurred during the clean-up. Please see the below message for "
4172 "more information. "
4173@@ -540,39 +540,37 @@
4174
4175 #. FIXME: instead of error out, fetch and install it
4176 #. here
4177-#: ../DistUpgrade/DistUpgradeController.py:1376
4178+#: ../DistUpgrade/DistUpgradeController.py:1367
4179 msgid "Required depends is not installed"
4180 msgstr ""
4181
4182-#: ../DistUpgrade/DistUpgradeController.py:1377
4183+#: ../DistUpgrade/DistUpgradeController.py:1368
4184 #, python-format
4185 msgid "The required dependency '%s' is not installed. "
4186 msgstr ""
4187
4188 #. sanity check (check for ubuntu-desktop, brokenCache etc)
4189 #. then open the cache (again)
4190-#: ../DistUpgrade/DistUpgradeController.py:1645
4191-#: ../DistUpgrade/DistUpgradeController.py:1732
4192+#: ../DistUpgrade/DistUpgradeController.py:1636
4193+#: ../DistUpgrade/DistUpgradeController.py:1701
4194 msgid "Checking package manager"
4195 msgstr "Paket idarəçisi yoxlanır"
4196
4197-#: ../DistUpgrade/DistUpgradeController.py:1651
4198-#: ../DistUpgrade/DistUpgradeController.py:1657
4199+#: ../DistUpgrade/DistUpgradeController.py:1641
4200 msgid "Preparing the upgrade failed"
4201 msgstr "Yeniləmənin hazırlanması alınmadı"
4202
4203-#: ../DistUpgrade/DistUpgradeController.py:1652
4204+#: ../DistUpgrade/DistUpgradeController.py:1642
4205 msgid ""
4206 "Preparing the system for the upgrade failed so a bug reporting process is "
4207 "being started."
4208 msgstr ""
4209
4210-#: ../DistUpgrade/DistUpgradeController.py:1675
4211-#: ../DistUpgrade/DistUpgradeController.py:1685
4212+#: ../DistUpgrade/DistUpgradeController.py:1656
4213 msgid "Getting upgrade prerequisites failed"
4214 msgstr ""
4215
4216-#: ../DistUpgrade/DistUpgradeController.py:1676
4217+#: ../DistUpgrade/DistUpgradeController.py:1657
4218 msgid ""
4219 "The system was unable to get the prerequisites for the upgrade. The upgrade "
4220 "will abort now and restore the original system state.\n"
4221@@ -580,23 +578,23 @@
4222 "Additionally, a bug reporting process is being started."
4223 msgstr ""
4224
4225-#: ../DistUpgrade/DistUpgradeController.py:1716
4226+#: ../DistUpgrade/DistUpgradeController.py:1685
4227 msgid "Updating repository information"
4228 msgstr "Saxlanc məlumatı yenilənir"
4229
4230-#: ../DistUpgrade/DistUpgradeController.py:1723
4231+#: ../DistUpgrade/DistUpgradeController.py:1692
4232 msgid "Failed to add the cdrom"
4233 msgstr ""
4234
4235+#: ../DistUpgrade/DistUpgradeController.py:1693
4236+msgid "Sorry, adding the cdrom was not successful."
4237+msgstr ""
4238+
4239 #: ../DistUpgrade/DistUpgradeController.py:1724
4240-msgid "Sorry, adding the cdrom was not successful."
4241-msgstr ""
4242-
4243-#: ../DistUpgrade/DistUpgradeController.py:1755
4244 msgid "Invalid package information"
4245 msgstr "Xətalı paket məlumatı"
4246
4247-#: ../DistUpgrade/DistUpgradeController.py:1756
4248+#: ../DistUpgrade/DistUpgradeController.py:1725
4249 #, python-format
4250 msgid ""
4251 "After updating your package information, the essential package '%s' could "
4252@@ -608,60 +606,60 @@
4253 "later."
4254 msgstr ""
4255
4256-#: ../DistUpgrade/DistUpgradeController.py:1784
4257-#: ../DistUpgrade/DistUpgradeController.py:1840
4258+#: ../DistUpgrade/DistUpgradeController.py:1749
4259+#: ../DistUpgrade/DistUpgradeController.py:1805
4260 msgid "Fetching"
4261 msgstr ""
4262
4263-#: ../DistUpgrade/DistUpgradeController.py:1790
4264-#: ../DistUpgrade/DistUpgradeController.py:1844
4265+#: ../DistUpgrade/DistUpgradeController.py:1755
4266+#: ../DistUpgrade/DistUpgradeController.py:1809
4267 msgid "Upgrading"
4268 msgstr "Yenilənir"
4269
4270 #. don't abort here, because it would restore the sources.list
4271-#: ../DistUpgrade/DistUpgradeController.py:1795
4272-#: ../DistUpgrade/DistUpgradeController.py:1846
4273-#: ../DistUpgrade/DistUpgradeController.py:1853
4274-#: ../DistUpgrade/DistUpgradeController.py:1864
4275+#: ../DistUpgrade/DistUpgradeController.py:1760
4276+#: ../DistUpgrade/DistUpgradeController.py:1811
4277+#: ../DistUpgrade/DistUpgradeController.py:1818
4278+#: ../DistUpgrade/DistUpgradeController.py:1829
4279 msgid "Upgrade complete"
4280 msgstr ""
4281
4282-#: ../DistUpgrade/DistUpgradeController.py:1796
4283-#: ../DistUpgrade/DistUpgradeController.py:1847
4284-#: ../DistUpgrade/DistUpgradeController.py:1854
4285+#: ../DistUpgrade/DistUpgradeController.py:1761
4286+#: ../DistUpgrade/DistUpgradeController.py:1812
4287+#: ../DistUpgrade/DistUpgradeController.py:1819
4288 msgid ""
4289 "The upgrade has completed but there were errors during the upgrade process."
4290 msgstr ""
4291
4292-#: ../DistUpgrade/DistUpgradeController.py:1803
4293+#: ../DistUpgrade/DistUpgradeController.py:1768
4294 msgid "Searching for obsolete software"
4295 msgstr ""
4296
4297-#: ../DistUpgrade/DistUpgradeController.py:1816
4298+#: ../DistUpgrade/DistUpgradeController.py:1781
4299 msgid "System upgrade is complete."
4300 msgstr "Sistemin yenilənməsi başa çatdı."
4301
4302-#: ../DistUpgrade/DistUpgradeController.py:1865
4303+#: ../DistUpgrade/DistUpgradeController.py:1830
4304 msgid "The partial upgrade was completed."
4305 msgstr ""
4306
4307 #: ../DistUpgrade/DistUpgradeFetcher.py:123
4308-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:117
4309+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:119
4310 msgid "Could not find the release notes"
4311 msgstr "Buraxılış qeydləri tapılmadı"
4312
4313 #: ../DistUpgrade/DistUpgradeFetcher.py:124
4314-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:118
4315+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:120
4316 msgid "The server may be overloaded. "
4317 msgstr "Server yüklənmiş ola bilər. "
4318
4319 #: ../DistUpgrade/DistUpgradeFetcher.py:136
4320-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:122
4321+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:124
4322 msgid "Could not download the release notes"
4323 msgstr "Buraxılış qeydləri endirilə bilmədi"
4324
4325 #: ../DistUpgrade/DistUpgradeFetcher.py:137
4326-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:123
4327+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:125
4328 msgid "Please check your internet connection."
4329 msgstr "İnternet əlaqənizi yoxlayın."
4330
4331@@ -670,111 +668,111 @@
4332 msgid "authenticate '%(file)s' against '%(signature)s' "
4333 msgstr ""
4334
4335-#: ../DistUpgrade/DistUpgradeFetcherCore.py:139
4336+#: ../DistUpgrade/DistUpgradeFetcherCore.py:136
4337 #, python-format
4338 msgid "extracting '%s'"
4339 msgstr ""
4340
4341-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
4342-#: ../DistUpgrade/DistUpgradeFetcherCore.py:161
4343+#: ../DistUpgrade/DistUpgradeFetcherCore.py:157
4344+#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
4345 msgid "Could not run the upgrade tool"
4346 msgstr "Təzələmə alətini işlətmək olmadı"
4347
4348-#: ../DistUpgrade/DistUpgradeFetcherCore.py:162
4349+#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
4350 msgid ""
4351 "This is most likely a bug in the upgrade tool. Please report it as a bug "
4352 "using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
4353 msgstr ""
4354
4355-#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
4356+#: ../DistUpgrade/DistUpgradeFetcherCore.py:236
4357 msgid "Upgrade tool signature"
4358 msgstr ""
4359
4360-#: ../DistUpgrade/DistUpgradeFetcherCore.py:246
4361+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
4362 msgid "Upgrade tool"
4363 msgstr "Təzələmə aləti"
4364
4365-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
4366+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
4367 msgid "Failed to fetch"
4368 msgstr "Alına bilmədi"
4369
4370-#: ../DistUpgrade/DistUpgradeFetcherCore.py:281
4371+#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
4372 msgid "Fetching the upgrade failed. There may be a network problem. "
4373 msgstr ""
4374
4375-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
4376+#: ../DistUpgrade/DistUpgradeFetcherCore.py:282
4377 msgid "Authentication failed"
4378 msgstr ""
4379
4380-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
4381+#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
4382 msgid ""
4383 "Authenticating the upgrade failed. There may be a problem with the network "
4384 "or with the server. "
4385 msgstr ""
4386
4387-#: ../DistUpgrade/DistUpgradeFetcherCore.py:291
4388+#: ../DistUpgrade/DistUpgradeFetcherCore.py:288
4389 msgid "Failed to extract"
4390 msgstr "İxrac edilə bilmədi"
4391
4392-#: ../DistUpgrade/DistUpgradeFetcherCore.py:292
4393+#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
4394 msgid ""
4395 "Extracting the upgrade failed. There may be a problem with the network or "
4396 "with the server. "
4397 msgstr ""
4398
4399-#: ../DistUpgrade/DistUpgradeFetcherCore.py:297
4400+#: ../DistUpgrade/DistUpgradeFetcherCore.py:294
4401 msgid "Verification failed"
4402 msgstr ""
4403
4404-#: ../DistUpgrade/DistUpgradeFetcherCore.py:298
4405+#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
4406 msgid ""
4407 "Verifying the upgrade failed. There may be a problem with the network or "
4408 "with the server. "
4409 msgstr ""
4410
4411-#: ../DistUpgrade/DistUpgradeFetcherCore.py:312
4412-#: ../DistUpgrade/DistUpgradeFetcherCore.py:318
4413+#: ../DistUpgrade/DistUpgradeFetcherCore.py:309
4414+#: ../DistUpgrade/DistUpgradeFetcherCore.py:315
4415 msgid "Can not run the upgrade"
4416 msgstr ""
4417
4418-#: ../DistUpgrade/DistUpgradeFetcherCore.py:313
4419+#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
4420 msgid ""
4421 "This usually is caused by a system where /tmp is mounted noexec. Please "
4422 "remount without noexec and run the upgrade again."
4423 msgstr ""
4424
4425-#: ../DistUpgrade/DistUpgradeFetcherCore.py:319
4426+#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
4427 #, python-format
4428 msgid "The error message is '%s'."
4429 msgstr ""
4430
4431-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:68
4432-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:99
4433+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:70
4434+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:101
4435 msgid "Upgrade"
4436 msgstr ""
4437
4438-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:103
4439+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:105
4440 #: ../data/gtkbuilder/ReleaseNotes.ui.h:1
4441 msgid "Release Notes"
4442 msgstr ""
4443
4444-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:145
4445-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:158
4446+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:147
4447+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:160
4448 msgid "Downloading additional package files..."
4449 msgstr ""
4450
4451-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:160
4452+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:162
4453 #, python-format
4454 msgid "File %s of %s at %sB/s"
4455 msgstr ""
4456
4457-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:164
4458+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:166
4459 #, python-format
4460 msgid "File %s of %s"
4461 msgstr ""
4462
4463 #. print("mediaChange %s %s" % (medium, drive))
4464-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:171
4465+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:173
4466 #: ../DistUpgrade/DistUpgradeViewGtk.py:114
4467 #: ../DistUpgrade/DistUpgradeViewGtk3.py:115
4468 #: ../DistUpgrade/DistUpgradeViewKDE.py:196
4469@@ -784,8 +782,8 @@
4470
4471 #. change = QMessageBox.question(None, _("Media Change"), msg,
4472 #. QMessageBox.Ok, QMessageBox.Cancel)
4473-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:174
4474-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:175
4475+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:176
4476+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:177
4477 #: ../DistUpgrade/DistUpgradeViewKDE.py:197
4478 msgid "Media Change"
4479 msgstr ""
4480@@ -805,7 +803,7 @@
4481 msgid "Your graphics hardware may not be fully supported in Ubuntu 13.04."
4482 msgstr ""
4483
4484-#: ../DistUpgrade/DistUpgradeQuirks.py:250
4485+#: ../DistUpgrade/DistUpgradeQuirks.py:248
4486 msgid ""
4487 "Running the 'unity' desktop environment is not fully supported by your "
4488 "graphics hardware. You will maybe end up in a very slow environment after "
4489@@ -815,20 +813,20 @@
4490 "want to continue with the upgrade?"
4491 msgstr ""
4492
4493+#: ../DistUpgrade/DistUpgradeQuirks.py:272
4494+msgid ""
4495+"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
4496+msgstr ""
4497+
4498 #: ../DistUpgrade/DistUpgradeQuirks.py:274
4499 msgid ""
4500-"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
4501-msgstr ""
4502-
4503-#: ../DistUpgrade/DistUpgradeQuirks.py:276
4504-msgid ""
4505 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
4506 "and you may encounter problems after the upgrade. For more information see "
4507 "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Do you want to "
4508 "continue with the upgrade?"
4509 msgstr ""
4510
4511-#: ../DistUpgrade/DistUpgradeQuirks.py:296
4512+#: ../DistUpgrade/DistUpgradeQuirks.py:294
4513 msgid ""
4514 "Upgrading may reduce desktop effects, and performance in games and other "
4515 "graphically intensive programs."
4516@@ -844,7 +842,7 @@
4517 "Do you want to continue?"
4518 msgstr ""
4519
4520-#: ../DistUpgrade/DistUpgradeQuirks.py:300
4521+#: ../DistUpgrade/DistUpgradeQuirks.py:298
4522 msgid ""
4523 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
4524 "of this driver is available that works with your hardware in Ubuntu 10.04 "
4525@@ -853,11 +851,11 @@
4526 "Do you want to continue?"
4527 msgstr ""
4528
4529-#: ../DistUpgrade/DistUpgradeQuirks.py:335
4530+#: ../DistUpgrade/DistUpgradeQuirks.py:333
4531 msgid "No i686 CPU"
4532 msgstr ""
4533
4534-#: ../DistUpgrade/DistUpgradeQuirks.py:336
4535+#: ../DistUpgrade/DistUpgradeQuirks.py:334
4536 msgid ""
4537 "Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
4538 "extension. All packages were built with optimizations requiring i686 as the "
4539@@ -865,11 +863,11 @@
4540 "Ubuntu release with this hardware."
4541 msgstr ""
4542
4543-#: ../DistUpgrade/DistUpgradeQuirks.py:372
4544+#: ../DistUpgrade/DistUpgradeQuirks.py:370
4545 msgid "No ARMv6 CPU"
4546 msgstr ""
4547
4548-#: ../DistUpgrade/DistUpgradeQuirks.py:373
4549+#: ../DistUpgrade/DistUpgradeQuirks.py:371
4550 msgid ""
4551 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
4552 "packages in karmic were built with optimizations requiring ARMv6 as the "
4553@@ -877,11 +875,11 @@
4554 "Ubuntu release with this hardware."
4555 msgstr ""
4556
4557-#: ../DistUpgrade/DistUpgradeQuirks.py:393
4558+#: ../DistUpgrade/DistUpgradeQuirks.py:391
4559 msgid "No init available"
4560 msgstr ""
4561
4562-#: ../DistUpgrade/DistUpgradeQuirks.py:394
4563+#: ../DistUpgrade/DistUpgradeQuirks.py:392
4564 msgid ""
4565 "Your system appears to be a virtualised environment without an init daemon, "
4566 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
4567@@ -1608,41 +1606,41 @@
4568 "via the exit code"
4569 msgstr ""
4570
4571-#: ../do-release-upgrade:113
4572+#: ../do-release-upgrade:108
4573 msgid "Checking for a new Ubuntu release"
4574 msgstr ""
4575
4576-#: ../do-release-upgrade:125
4577+#: ../do-release-upgrade:121
4578 msgid "Your Ubuntu release is not supported anymore."
4579 msgstr ""
4580
4581-#: ../do-release-upgrade:126
4582+#: ../do-release-upgrade:122
4583 msgid ""
4584 "For upgrade information, please visit:\n"
4585 "%(url)s\n"
4586 msgstr ""
4587
4588-#: ../do-release-upgrade:132
4589+#: ../do-release-upgrade:128
4590 msgid "No new release found"
4591 msgstr ""
4592
4593-#: ../do-release-upgrade:137
4594+#: ../do-release-upgrade:133
4595 msgid "Release upgrade not possible right now"
4596 msgstr ""
4597
4598-#: ../do-release-upgrade:138
4599+#: ../do-release-upgrade:134
4600 #, c-format
4601 msgid ""
4602 "The release upgrade can not be performed currently, please try again later. "
4603 "The server reported: '%s'"
4604 msgstr ""
4605
4606-#: ../do-release-upgrade:144
4607+#: ../do-release-upgrade:140
4608 #, c-format
4609 msgid "New release '%s' available."
4610 msgstr ""
4611
4612-#: ../do-release-upgrade:145
4613+#: ../do-release-upgrade:141
4614 msgid "Run 'do-release-upgrade' to upgrade to it."
4615 msgstr ""
4616
4617
4618=== modified file 'po/be.po'
4619--- po/be.po 2014-04-07 14:07:10 +0000
4620+++ po/be.po 2021-05-11 08:09:06 +0000
4621@@ -16,12 +16,12 @@
4622 "Content-Transfer-Encoding: 8bit\n"
4623 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
4624 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
4625-"X-Launchpad-Export-Date: 2014-04-05 06:07+0000\n"
4626-"X-Generator: Launchpad (build 16976)\n"
4627+"X-Launchpad-Export-Date: 2014-04-23 06:50+0000\n"
4628+"X-Generator: Launchpad (build 16985)\n"
4629 "Language: be\n"
4630
4631 #. TRANSLATORS: %s is a country
4632-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
4633+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:441
4634 #, python-format
4635 msgid "Server for %s"
4636 msgstr "Сервер для %s"
4637@@ -181,18 +181,19 @@
4638 msgid "Trying to install blacklisted version '%s'"
4639 msgstr "Спроба ўсталёўкі ўнесенай у чорны спіс версіі '%s'"
4640
4641+#: ../DistUpgrade/DistUpgradeCache.py:859
4642+#, python-format
4643+msgid "Can't install '%s'"
4644+msgstr "Немагчыма ўсталяваць \"%s\""
4645+
4646 #: ../DistUpgrade/DistUpgradeCache.py:860
4647-#, python-format
4648-msgid "Can't install '%s'"
4649-msgstr "Немагчыма ўсталяваць \"%s\""
4650-
4651-#: ../DistUpgrade/DistUpgradeCache.py:861
4652 msgid ""
4653 "It was impossible to install a required package. Please report this as a bug "
4654 "using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
4655 msgstr ""
4656
4657-#: ../DistUpgrade/DistUpgradeCache.py:872
4658+#. FIXME: provide a list
4659+#: ../DistUpgrade/DistUpgradeCache.py:871
4660 msgid "Can't guess meta-package"
4661 msgstr "Немагчыма вызначыць мета-пакет"
4662
4663@@ -435,22 +436,21 @@
4664 "\n"
4665 "Дадаць стандартны запіс для '%s'? Выбар «Не» азначае адмову ад абнаўлення."
4666
4667-#: ../DistUpgrade/DistUpgradeController.py:820
4668-#: ../DistUpgrade/DistUpgradeController.py:826
4669+#: ../DistUpgrade/DistUpgradeController.py:819
4670 msgid "Repository information invalid"
4671 msgstr "Інфармацыя аб сховішчы няслушная"
4672
4673-#: ../DistUpgrade/DistUpgradeController.py:821
4674+#: ../DistUpgrade/DistUpgradeController.py:820
4675 msgid ""
4676 "Upgrading the repository information resulted in a invalid file so a bug "
4677 "reporting process is being started."
4678 msgstr ""
4679
4680-#: ../DistUpgrade/DistUpgradeController.py:836
4681+#: ../DistUpgrade/DistUpgradeController.py:827
4682 msgid "Third party sources disabled"
4683 msgstr "Зыходнікі ад трэціх бакоў - адключаныя"
4684
4685-#: ../DistUpgrade/DistUpgradeController.py:837
4686+#: ../DistUpgrade/DistUpgradeController.py:828
4687 msgid ""
4688 "Some third party entries in your sources.list were disabled. You can re-"
4689 "enable them after the upgrade with the 'software-properties' tool or your "
4690@@ -460,14 +460,14 @@
4691 "зможаце іх зноў уключыць пасля абнаўлення з дапамогай утыліты «Крыніцы "
4692 "ўсталёўкі» альбо вашага мэнэджара пакункаў."
4693
4694-#: ../DistUpgrade/DistUpgradeController.py:879
4695+#: ../DistUpgrade/DistUpgradeController.py:870
4696 msgid "Package in inconsistent state"
4697 msgid_plural "Packages in inconsistent state"
4698 msgstr[0] "Пакунак у нестабільным стане"
4699 msgstr[1] "Пакункі ў няўстойлівым стане"
4700 msgstr[2] "Пакункаў у наўстойлівым стане"
4701
4702-#: ../DistUpgrade/DistUpgradeController.py:882
4703+#: ../DistUpgrade/DistUpgradeController.py:873
4704 #, python-format
4705 msgid ""
4706 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
4707@@ -490,11 +490,11 @@
4708 "знойдзены адпаведныя архівы. Калі ласка, пераўсталюйце гэтыя пакункі уручную "
4709 "альбо выдаліце іх з сістэмы."
4710
4711-#: ../DistUpgrade/DistUpgradeController.py:930
4712+#: ../DistUpgrade/DistUpgradeController.py:921
4713 msgid "Error during update"
4714 msgstr "Памылка падчас абнаўлення"
4715
4716-#: ../DistUpgrade/DistUpgradeController.py:931
4717+#: ../DistUpgrade/DistUpgradeController.py:922
4718 msgid ""
4719 "A problem occurred during the update. This is usually some sort of network "
4720 "problem, please check your network connection and retry."
4721@@ -502,11 +502,11 @@
4722 "Пры абнаўленні паўстала праблема. Звычайна гэта бывае выклікана праблемамі ў "
4723 "сетцы. Праверце сеткавыя злучэнні і паспрабуйце яшчэ."
4724
4725-#: ../DistUpgrade/DistUpgradeController.py:940
4726+#: ../DistUpgrade/DistUpgradeController.py:931
4727 msgid "Not enough free disk space"
4728 msgstr "Бракуе дыскавае прасторы"
4729
4730-#: ../DistUpgrade/DistUpgradeController.py:941
4731+#: ../DistUpgrade/DistUpgradeController.py:932
4732 #, python-format
4733 msgid ""
4734 "The upgrade has aborted. The upgrade needs a total of %s free space on disk "
4735@@ -521,21 +521,21 @@
4736
4737 #. calc the dist-upgrade and see if the removals are ok/expected
4738 #. do the dist-upgrade
4739-#: ../DistUpgrade/DistUpgradeController.py:970
4740-#: ../DistUpgrade/DistUpgradeController.py:1778
4741+#: ../DistUpgrade/DistUpgradeController.py:961
4742+#: ../DistUpgrade/DistUpgradeController.py:1743
4743 msgid "Calculating the changes"
4744 msgstr "Падлічыць змены"
4745
4746 #. ask the user
4747-#: ../DistUpgrade/DistUpgradeController.py:1002
4748+#: ../DistUpgrade/DistUpgradeController.py:993
4749 msgid "Do you want to start the upgrade?"
4750 msgstr "Ці жадаеце пачаць абнаўленне?"
4751
4752-#: ../DistUpgrade/DistUpgradeController.py:1075
4753+#: ../DistUpgrade/DistUpgradeController.py:1066
4754 msgid "Upgrade canceled"
4755 msgstr "Абнаўленне скасавана"
4756
4757-#: ../DistUpgrade/DistUpgradeController.py:1076
4758+#: ../DistUpgrade/DistUpgradeController.py:1067
4759 msgid ""
4760 "The upgrade will cancel now and the original system state will be restored. "
4761 "You can resume the upgrade at a later time."
4762@@ -543,12 +543,12 @@
4763 "Гэта абнаўленне будзе зараз скасавана і адбудзецца аднаўленне зыходнага "
4764 "стану сістэмы. Вы можаце працягнуць гэта абнаўленне пазней."
4765
4766-#: ../DistUpgrade/DistUpgradeController.py:1082
4767-#: ../DistUpgrade/DistUpgradeController.py:1206
4768+#: ../DistUpgrade/DistUpgradeController.py:1073
4769+#: ../DistUpgrade/DistUpgradeController.py:1197
4770 msgid "Could not download the upgrades"
4771 msgstr "Не атрымалася загрузіць абнаўленні"
4772
4773-#: ../DistUpgrade/DistUpgradeController.py:1083
4774+#: ../DistUpgrade/DistUpgradeController.py:1074
4775 msgid ""
4776 "The upgrade has aborted. Please check your Internet connection or "
4777 "installation media and try again. All files downloaded so far have been kept."
4778@@ -559,27 +559,27 @@
4779
4780 #. FIXME: strings are not good, but we are in string freeze
4781 #. currently
4782-#: ../DistUpgrade/DistUpgradeController.py:1157
4783-#: ../DistUpgrade/DistUpgradeController.py:1194
4784-#: ../DistUpgrade/DistUpgradeController.py:1299
4785+#: ../DistUpgrade/DistUpgradeController.py:1148
4786+#: ../DistUpgrade/DistUpgradeController.py:1185
4787+#: ../DistUpgrade/DistUpgradeController.py:1290
4788 msgid "Error during commit"
4789 msgstr "Памылка пры фіксаванні"
4790
4791 #. generate a new cache
4792-#: ../DistUpgrade/DistUpgradeController.py:1159
4793-#: ../DistUpgrade/DistUpgradeController.py:1196
4794-#: ../DistUpgrade/DistUpgradeController.py:1338
4795+#: ../DistUpgrade/DistUpgradeController.py:1150
4796+#: ../DistUpgrade/DistUpgradeController.py:1187
4797+#: ../DistUpgrade/DistUpgradeController.py:1329
4798 msgid "Restoring original system state"
4799 msgstr "Аднаўленне першапачатковага стану сістэмы"
4800
4801-#: ../DistUpgrade/DistUpgradeController.py:1160
4802-#: ../DistUpgrade/DistUpgradeController.py:1175
4803-#: ../DistUpgrade/DistUpgradeController.py:1197
4804+#: ../DistUpgrade/DistUpgradeController.py:1151
4805+#: ../DistUpgrade/DistUpgradeController.py:1166
4806+#: ../DistUpgrade/DistUpgradeController.py:1188
4807 msgid "Could not install the upgrades"
4808 msgstr "Немагчыма ўсталяваць абнаўленні"
4809
4810 #. invoke the frontend now and show a error message
4811-#: ../DistUpgrade/DistUpgradeController.py:1165
4812+#: ../DistUpgrade/DistUpgradeController.py:1156
4813 msgid ""
4814 "The upgrade has aborted. Your system could be in an unusable state. A "
4815 "recovery will run now (dpkg --configure -a)."
4816@@ -588,7 +588,7 @@
4817 "для нармальнага выкарыстання. Зараз будзе запушчаны працэс аднаўлення (dpkg -"
4818 "-configure -a)."
4819
4820-#: ../DistUpgrade/DistUpgradeController.py:1170
4821+#: ../DistUpgrade/DistUpgradeController.py:1161
4822 #, python-format
4823 msgid ""
4824 "\n"
4825@@ -599,7 +599,7 @@
4826 "%s"
4827 msgstr ""
4828
4829-#: ../DistUpgrade/DistUpgradeController.py:1207
4830+#: ../DistUpgrade/DistUpgradeController.py:1198
4831 msgid ""
4832 "The upgrade has aborted. Please check your Internet connection or "
4833 "installation media and try again. "
4834@@ -607,20 +607,20 @@
4835 "Абнаўленне спыненае. Калі ласка праверце злучэнне з Інтэрнэтам, альбо іншую "
4836 "крыніцу ўсталёўкі і паспрабуйце зноў. "
4837
4838-#: ../DistUpgrade/DistUpgradeController.py:1287
4839+#: ../DistUpgrade/DistUpgradeController.py:1278
4840 msgid "Remove obsolete packages?"
4841 msgstr "Выдаліць састарэлыя пакеты?"
4842
4843-#: ../DistUpgrade/DistUpgradeController.py:1288
4844+#: ../DistUpgrade/DistUpgradeController.py:1279
4845 #: ../data/gtkbuilder/DistUpgrade.ui.h:8
4846 msgid "_Keep"
4847 msgstr "За_хаваць"
4848
4849-#: ../DistUpgrade/DistUpgradeController.py:1288
4850+#: ../DistUpgrade/DistUpgradeController.py:1279
4851 msgid "_Remove"
4852 msgstr "_Выдаліць"
4853
4854-#: ../DistUpgrade/DistUpgradeController.py:1300
4855+#: ../DistUpgrade/DistUpgradeController.py:1291
4856 msgid ""
4857 "A problem occurred during the clean-up. Please see the below message for "
4858 "more information. "
4859@@ -628,39 +628,37 @@
4860
4861 #. FIXME: instead of error out, fetch and install it
4862 #. here
4863-#: ../DistUpgrade/DistUpgradeController.py:1376
4864+#: ../DistUpgrade/DistUpgradeController.py:1367
4865 msgid "Required depends is not installed"
4866 msgstr "Неабходныя залежнасці не ўсталяваныя"
4867
4868-#: ../DistUpgrade/DistUpgradeController.py:1377
4869+#: ../DistUpgrade/DistUpgradeController.py:1368
4870 #, python-format
4871 msgid "The required dependency '%s' is not installed. "
4872 msgstr "Неабходныя залежнасці \"%s\" не ўсталяваныя. "
4873
4874 #. sanity check (check for ubuntu-desktop, brokenCache etc)
4875 #. then open the cache (again)
4876-#: ../DistUpgrade/DistUpgradeController.py:1645
4877-#: ../DistUpgrade/DistUpgradeController.py:1732
4878+#: ../DistUpgrade/DistUpgradeController.py:1636
4879+#: ../DistUpgrade/DistUpgradeController.py:1701
4880 msgid "Checking package manager"
4881 msgstr "Праверка мэнэджара пакетаў"
4882
4883-#: ../DistUpgrade/DistUpgradeController.py:1651
4884-#: ../DistUpgrade/DistUpgradeController.py:1657
4885+#: ../DistUpgrade/DistUpgradeController.py:1641
4886 msgid "Preparing the upgrade failed"
4887 msgstr "Збой падрыхтоўкі да абнаўлення"
4888
4889-#: ../DistUpgrade/DistUpgradeController.py:1652
4890+#: ../DistUpgrade/DistUpgradeController.py:1642
4891 msgid ""
4892 "Preparing the system for the upgrade failed so a bug reporting process is "
4893 "being started."
4894 msgstr ""
4895
4896-#: ../DistUpgrade/DistUpgradeController.py:1675
4897-#: ../DistUpgrade/DistUpgradeController.py:1685
4898+#: ../DistUpgrade/DistUpgradeController.py:1656
4899 msgid "Getting upgrade prerequisites failed"
4900 msgstr "Падрыхтоўка да абнаўлення завяршылася няўдала"
4901
4902-#: ../DistUpgrade/DistUpgradeController.py:1676
4903+#: ../DistUpgrade/DistUpgradeController.py:1657
4904 msgid ""
4905 "The system was unable to get the prerequisites for the upgrade. The upgrade "
4906 "will abort now and restore the original system state.\n"
4907@@ -668,23 +666,23 @@
4908 "Additionally, a bug reporting process is being started."
4909 msgstr ""
4910
4911-#: ../DistUpgrade/DistUpgradeController.py:1716
4912+#: ../DistUpgrade/DistUpgradeController.py:1685
4913 msgid "Updating repository information"
4914 msgstr "Абнаўленне інфармацыі аб сховішчы"
4915
4916-#: ../DistUpgrade/DistUpgradeController.py:1723
4917+#: ../DistUpgrade/DistUpgradeController.py:1692
4918 msgid "Failed to add the cdrom"
4919 msgstr "Дадаванне кампакт-дыска завяршылася няўдала"
4920
4921-#: ../DistUpgrade/DistUpgradeController.py:1724
4922+#: ../DistUpgrade/DistUpgradeController.py:1693
4923 msgid "Sorry, adding the cdrom was not successful."
4924 msgstr "Выбачайце, даданне кампакт-дыска завяршылася няўдала."
4925
4926-#: ../DistUpgrade/DistUpgradeController.py:1755
4927+#: ../DistUpgrade/DistUpgradeController.py:1724
4928 msgid "Invalid package information"
4929 msgstr "Некарэктная інфармацыя аб пакеце"
4930
4931-#: ../DistUpgrade/DistUpgradeController.py:1756
4932+#: ../DistUpgrade/DistUpgradeController.py:1725
4933 #, python-format
4934 msgid ""
4935 "After updating your package information, the essential package '%s' could "
4936@@ -696,61 +694,61 @@
4937 "later."
4938 msgstr ""
4939
4940-#: ../DistUpgrade/DistUpgradeController.py:1784
4941-#: ../DistUpgrade/DistUpgradeController.py:1840
4942+#: ../DistUpgrade/DistUpgradeController.py:1749
4943+#: ../DistUpgrade/DistUpgradeController.py:1805
4944 msgid "Fetching"
4945 msgstr "Атрыманне"
4946
4947-#: ../DistUpgrade/DistUpgradeController.py:1790
4948-#: ../DistUpgrade/DistUpgradeController.py:1844
4949+#: ../DistUpgrade/DistUpgradeController.py:1755
4950+#: ../DistUpgrade/DistUpgradeController.py:1809
4951 msgid "Upgrading"
4952 msgstr "Абнаўленне"
4953
4954 #. don't abort here, because it would restore the sources.list
4955-#: ../DistUpgrade/DistUpgradeController.py:1795
4956-#: ../DistUpgrade/DistUpgradeController.py:1846
4957-#: ../DistUpgrade/DistUpgradeController.py:1853
4958-#: ../DistUpgrade/DistUpgradeController.py:1864
4959+#: ../DistUpgrade/DistUpgradeController.py:1760
4960+#: ../DistUpgrade/DistUpgradeController.py:1811
4961+#: ../DistUpgrade/DistUpgradeController.py:1818
4962+#: ../DistUpgrade/DistUpgradeController.py:1829
4963 msgid "Upgrade complete"
4964 msgstr "Абнаўленне скончана"
4965
4966-#: ../DistUpgrade/DistUpgradeController.py:1796
4967-#: ../DistUpgrade/DistUpgradeController.py:1847
4968-#: ../DistUpgrade/DistUpgradeController.py:1854
4969+#: ../DistUpgrade/DistUpgradeController.py:1761
4970+#: ../DistUpgrade/DistUpgradeController.py:1812
4971+#: ../DistUpgrade/DistUpgradeController.py:1819
4972 msgid ""
4973 "The upgrade has completed but there were errors during the upgrade process."
4974 msgstr ""
4975 "Абнаўленне скончана, аднак падчас працэсу абнаўлення здарыліся памылкі."
4976
4977-#: ../DistUpgrade/DistUpgradeController.py:1803
4978+#: ../DistUpgrade/DistUpgradeController.py:1768
4979 msgid "Searching for obsolete software"
4980 msgstr "Пошук састарэлых праграм"
4981
4982-#: ../DistUpgrade/DistUpgradeController.py:1816
4983+#: ../DistUpgrade/DistUpgradeController.py:1781
4984 msgid "System upgrade is complete."
4985 msgstr "Абнаўленне сістэмы завершана"
4986
4987-#: ../DistUpgrade/DistUpgradeController.py:1865
4988+#: ../DistUpgrade/DistUpgradeController.py:1830
4989 msgid "The partial upgrade was completed."
4990 msgstr "Частковае абнаўленне завершана."
4991
4992 #: ../DistUpgrade/DistUpgradeFetcher.py:123
4993-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:117
4994+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:119
4995 msgid "Could not find the release notes"
4996 msgstr "Не атрымалася знайсці заўвагі да выпуску"
4997
4998 #: ../DistUpgrade/DistUpgradeFetcher.py:124
4999-#: ../DistUpgrade/DistUpgradeFetcherKDE.py:118
5000+#: ../DistUpgrade/DistUpgradeFetcherKDE.py:120
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to status/vote changes: